Fixed / Proposal for #13181, also thanks to Klaas van Schelven.