Merge remote-tracking branch 'coss/hotfix/abstract-controller'