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