Merge remote-tracking branch 'origin/main' into 1935-duplicate-define-nonbe_svd_optimization-in-options-h