Merge branch 'hotfix/fix_app_cache_gen'
Merge branch 'master' into develop
fixes deploy file