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

merged controllers