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