Resolve "duplicate define (NONBE_SVD_OPTIMIZATION) in options.h" Closes #1935 See merge request !2121