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