Merge pull request #1493 from brucehoff/release-58

PLFM-2979
Merge branch 'release-58' into develop