MFH: r552116
incorporate a side fix from upstream
PR: 250097 Submitted by: Michael Bueker <m.bueker@berlin.de>