[FIXED JENKINS-10593] Merged pull request #622 to core

Reference: https://github.com/jenkinsci/jenkins/pull/622