Merged in multi-transport changes