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