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