Merge branch 'master' into 'revert-e86f9476'

# Conflicts:
#   pom.xml
2 jobs for revert-e86f9476 in 4 minutes and 14 seconds (queued for 1 second)
latest
Status Job ID Name Coverage
  Windows
passed #272971
Windows10
masterJobWindows

00:02:15

 
  Linux
passed #272972
BranchJobLinux

00:01:59