JBIDE-15598 Issue source changes

These are the source changes authored by Syed, for resolution of issue JBIDE-15598.