Merge remote-tracking branch 'origin/main' into...

Merge remote-tracking branch 'origin/main' into 666-switch-fix_613_dirac_null_ptr_usan-missing-from-options-h