[FIXED JENKINS-19889] - Additional variables fix