CAPEDWARF-215 Namespaces not handled properly in certain situations