Patches pushed as 7b8ac3e9a3b7d132fe9d564ebd8db3b89766e3b0 and following with a few modifications. Thanks.