Master merge 

Integrate changes from 7/28.