Merge to 1.0.9 release branch