Updated from flex_build #a3aa3ed9d4