Patches applied as f17d1b094745f28769a2bd83271746d31fbca9fe and
following with some modifications to commit messages.
Thanks.