Merge branch 'JENKINS-17545'