Merge branch 'jk/transfer-limit-redirection' into maint-2.3