[fix for JENKINS-18279] Updated core + added test