Merge 0.10.x to master