JBIDE-13386: Modified URLs and labels