Merge 1.5 branch