Partly reverting f83d455 as it caused a verify error when running builds.
Merge commit '079ec15'
Merge branch 'master' into ArtifactManager-JENKINS-17236