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