+ [OE-4176] diagnoses namespace support