Merge branch 'tb/xcurl-off-t'