Ahreadmeagain

@seriousamlqz @yzhang90 @xiaohe27 @owolabileg please review **carefully**. 
@xiaohe27 Please fill in the correct "(link to source patch)" below.