Merge "Update globals to log security levels on fail" into main