Merged from Jenkins 6d081fa
Merged from Jenkins a184ef5
Merged from Jenkins af5cac0
Merged from Jenkins 678b3d7
Merged from Jenkins 0b49ff9
Fix for Jenkins JENKINS-22373