1a3f892ddc
Ref #45938
(cherry picked from commit 76495374dc)
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>