Properly merged new_build, rebased out the problems with data files getting committed.