Merge pull request #481 from john-hill/PLFM-1930

workers combined
merged controllers
code review change
Merge pull request #485 from john-hill/PLFM-1930-B

Plfm 1930 b