Merge branch 'hotfix-sonatype' into develop