Merge pull request #1075 from john-hill/PLFM-2377-f

Plfm 2377 f
Merge branch 'release-31' into develop