Patches pushed as df07ecbac6ef76f0f4d47606d85888fbcd2f0454 and following
with a few modifications.
Thanks.