Patches pushed as 4cc345faf950fe47afd38ce9657ce8d5d69acaf9 and
following.
Thanks.