JBIDE-13042 (apply in master from JBIDE-13042)