JBIDE-14917 bad merge