Merge Release 0.9.10 to master