[JENKINS-18534] Added test contributed by @christ66