[fixed JENKINS-18278] Added solution and test
[JENKINS-18281] Added test
Testing