Merge pull request #1383 from john-hill/PLFM-2850-b

Plfm 2850 b
Merge branch 'release-47' into develop