Merge merge_all branch.