JBIDE-14896_b2 ensuring possibility for null extended props