Correct working with Default controller, controllers routing
Merge branch 'master' into stable