Merge changes from release-1.7