Merge branch 'master' into 'automated-upgrade/org.apache.logging.log4j-log4j-core'

# Conflicts:
#   build.gradle
4 jobs for automated-upgrade/org.apache.logging.log4j-log4j-core in 8 minutes and 58 seconds (queued for 19 seconds)