PLFM-2979
Merge pull request #1495 from brucehoff/release-58

PLFM-2979