Merge 3.1