Merge "Fix transfer API."