Merge branch 'bugfix/ci-majic-release' into 'develop'