Merge pull request #1569 from john-hill/PLFM-3032

fixed
Merge branch 'release-63' into develop