Reduce the size of project
Merge branch 'develop'