Merge branch 'hotfix/1.0.4'
Merge branch 'release/1.0.5'
hotfix test sakai
Merge branch 'hotfix/1.0.5-somefix' into develop