Merged multi-transport to trunk, all tests passed