Merge branch 'master' into 'EE-infrastructure'

# Conflicts:
#   pom.xml
1 job for EE-infrastructure in 1 minute and 6 seconds
Status Job ID Name Coverage
  Linux
passed #484993
BranchJobLinux

00:01:06