Merge the fix_test branch.