Merge branch 'release/improve_appcache'
Merge branch 'master' into dev