Merge "Adding Thoralf, John, Martin, Mahesh, Alex, Xiaohua as committers"