Merge branch 'master' into 'revert-e86f9476'

# Conflicts:
#   pom.xml
2 jobs for revert-e86f9476 in 2 minutes and 28 seconds (queued for 2 seconds)