Co-authored-by: Daniel Dietzler <mail@ddietzler.dev> (cherry picked from commit d1e874fc1e16ab53c80f723dd1905cd7e106cac0)