Merge "Update to Diagnostic Callback flows for multilayer"