Merge branch 'master' into 'revert-e86f9476'

# Conflicts:
#   pom.xml
Status Job ID Name Coverage
  Windows
passed #270572
Windows10
masterJobWindows

00:01:51

 
  Linux
passed #270573
BranchJobLinux

00:00:37