split to concern
Merge branch 'concern_app_controller' into forked