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