blockwise-transfer rebase into master for merge/review