[JENKINS-17230] Added backwards compatibility