CAT9 support on Flex2