Merge branch 'initialize-data' into develop
Merge branch 'develop' into initialize-data