Merge branch 'develop' into release
Merge branch 'develop' into release
remove unused files
add cacheFlags