[FIXED JENKINS-24020] Suggested fixes