[1603] Fix Diagnosecodes ExtensionPoint addressing