Preparation for Sonatype merge.