merged updates from release-0-9-0