:)
Fixes for PLFM-1888, PLFM-1891, PLFM-1892
Merge pull request #425 from john-hill/PLFM-1891

PLFM-1888, PFLM-1891, PLFM-1892