(cherry picked from commit f76a11c955) Co-authored-by: Benedikt Spellmeyer <b.spellmeyer@googlemail.com>
f76a11c955