preneseno v master
Merge branch 'km4054-feature-controllers' into feature-controllers