Patches applied as 1dbc630a3390d7232e26b4cfa3499b579b82e553 and
following (with some modifications and complete commit messages).
Thanks.