25498b6b62
Backport of MDL-76722. Co-authored by: Andrew Lyons <andrew@nicols.co.uk>
Backport of MDL-76722. Co-authored by: Andrew Lyons <andrew@nicols.co.uk>