Thanks to matiasb for the report of #20060 and the draft patch for #20048. (cherry picked from commit 930af661)