Merge branch 'hotfix/1.5.8'
fix inheritence of controllers
Merge branch 'hotfix/1.5.9' into develop