Fixing JENKINS-25059
Fixing JENKINS-23533
Merge pull request #19 from Praqma/JENKINS-25069

JENKINS-25069, JENKINS-23533