(Merge 3.2) Issue #9756: credit the author, Andreas Stührk (Trundle)