[ #25405 ] Implement most of the transfer features