Merge pull request #349 from john-hill/PLFM-1792

Plfm 1792
Merge branch 'release-1.21' into develop