Patches pushed as 4eddce8ce9337fd4d8f4fd97b7d41ac3cef4e3f0 and following. Thanks.