JBIDE-15454 - For JBIDE 4.1.1.Alpha1: Code Freeze + Branch