applied JBIDE-14913 to beta2 branch