PR: 234488 Submitted by: Michiel van Baak <michiel@vanbaak.eu> (maintainer) (with slight modification)