Merge pull request #484 from john-hill/PLFM-1930-B

merged controllers
Merge branch 'release-x' into develop