Integrating from release-0.10.1 into master