Note: I would also like to add the patch (the one attached to the ticket was applied upstream) for #769741, if that's okay. Cheers, Dominic.