[FIXED JENKINS-22582]

Integrated v2.38