Merge "Add options to disable diagnostics collector" into main