JBIDE-14867 - Making Denis' changes to beta2x branch