Patches pushed as 20eb41b66adc5933cf34323a3c010b8d57ab7eae and following
with a few modifications.
Thanks.