JBIDE-14656_and_JBIDE-14673_and_JBIDE-14674, revised >> master