Merge branch 'master' into 'enforce-owner-access'

# Conflicts:
#   pom.xml
1 job for !10 with enforce-owner-access in 1 minute (queued for 1 second)
merge request