JBIDE 17556

This commit also fixes JBIDE-17555