Hi Guix, I forgot my patch was applied on some other work. This cherry-picks it on to master. Thanks, John