Final commit from Rajath before Hongwei commits message passing code for
MP2