Issue #21952:back out change for 21068
Issue #21307:populate additional prj columns
Merge pull request #94 from garyhgohoos/21952

Issue #21952:back out change for 21068
Merge pull request #95 from garyhgohoos/21307

Issue #21307:populate additional prj columns