MFC
Merging r272528 through r272538