Work in progress
Ready to merge into master
Merge branch 'fix-controllers'