Manual Update
Merge branch '1.0.9' into 1.0.10