Backport patch from upstream
Richard Hughes • 3 years ago