Patches applied as fe4c2a1277813d3f8e48671aad0a281e880a71cb and
following.
Thanks.