Merge branch 'master' into fixGitlabCI

# Conflicts:
#	pom.xml
1 job for fixGitlabCI in 49 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #124602
BranchJob

00:00:49