Fixed merge conflicts, merged better_use_of_flex_home into master.