Patches pushed as 8a620036d7490766be1822213ed8ab88cbe4f491 and following. Thanks.