Merge branch 'master' into base_app