Controller updates
Merge branch 'B-rabbit54-master'