Merge branch 'master' into develop
Finished sync of develop and master branches