Merge branch 'hotfix/update_build'
Merge branch 'master' into develop