Integrate from Release 0.10.0 to master