Added #ifndef check for FLAG_VARIANT6 since the macro is only present 1.13+dev