Merge 1.5 changes