Merge branch 'JENKINS-17212' into jenkins