Merge branch 'release/1.7.0' into develop
Merge branch 'hotfix/Ooop_missing_files' into develop
[Fix] Missing files
Merge branch 'release/Ooops_another_missing_files'