Apply 1.0.9 changes
Apply 1.0.10 changes