Co-authored-by: Georg Wacker <contact@georgwacker.com> (cherry picked from commit 739d27ae40)
739d27ae40