Merge 1.0.13 to master

Merge 1.0.13 to master