Credit @ThomasChr for #12015 and #12245