Patches applied as d844eecd34ad718da8aedcd3d19ac0e447cdf467 and
following with some minor modifications and completed commit messages.
Thanks.