Issue #22421:add columns
Merge pull request #137 from garyhgohoos/22421

Issue #22421:add columns