Merge pull request #23321 from davejenx/report-column-nodisplay