Updated from flex_build #a46641102d