Merge 1.x up to master