Merge branch '666-switch-fix_613_dirac_null_ptr_usan-missing-from-options-h' into 'main'
Resolve "Switch FIX_613_DIRAC_NULL_PTR_USAN missing from options.h" See merge request !900
Resolve "Switch FIX_613_DIRAC_NULL_PTR_USAN missing from options.h" See merge request !900