Manual merges from messaging2