JBIDE-13938 Refactored