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