Patches pushed as e101a117eb5af9affcf68e27e91d68d3bfd72986 and
following.
Thanks.