Merge branch 'xfer_close' into testing