Patches applied as fa3633134464f17eeca61205382187796cbcdcca and
following.
Thanks.