JBIDE-13512: Forge N&N for 4.1.0.Alpha1