Merged 1.7.x into master