Merge 3.5 changes