Merge pull request #377 from xschildw/release-1.23

Temp fix for PLFM-1835. Do not merge back into develop branch.
fix
Merge pull request #380 from john-hill/PLFM-1840

fix