Merge pull request #367 from john-hill/PLFM-1828

:)
Merge branch 'release-1.22' into develop