Tiny controller refacroring
Merge branch 'master' into kirs-refactoring-controllers