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