Merge changes from topic 'cleanup-maven'