Merge branch 'develop'
Merge branch 'task-21-fix_controller_bug' into develop