Merge "MultiMsgCollector moving package"