Merge "Treat VER_2_1_DEVEL the same as VER_0_8_X"