Merge pull request #509 from john-hill/PLFM-1955

Plfm 1955
one
almost done
merged develop
fixed test
PLFM-1966
Merge pull request #517 from jay-hodgson/develop

PLFM-1966
Reduced worker timing
Merge pull request #516 from john-hill/PLFM-1960

Plfm 1960