Could you please rebase patch on fresh 2.0? After that, I will give final assessment.
Also, did you manage to check that xfer optimisation really works at runtime?