Merge "Revert "Set diagnostics log-data-type to CONNDIAG"" into main