Merge remote-tracking branch 'origin/fix_msvc_build' into feature_eigen + remove commented line in CMakeLists