Merged v1.60 into multi-transport