Don't use scoped enum
Merge branch 'msvc_o2'