Patches applied as e6a9b48877cd71d6eebcffd669dbc1f530b1358f and
following.
Thanks.