Updated from flex_build #eceef77c