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