Revert "Revert "Changes as of Aug 14""

This reverts commit bede0e08e27a5b5ab915bbaaa3eb5071cc2302af.