[FIXED JENKINS-18895] Refined fix once again.
Merge commit 'ec9b4f1' into rc