half controllers
Merge branch 'develop' into feature/controllers
controller+dependent-detroy