Merge 1.5.x to master