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