Merged Fixes from 1.7.2

Merged Fixes from 1.7.2 and updated imports to latest 1.7.5 sources.