Patches pushed as bad546939f3668610c173f931d905176e26c59c4 and following
with a few fixes.
Thanks.