Merge "maven-release-4.0.4"