Co-authored-by: Tobias Kunze <r@rixx.de> Backport of ed2d411aa84efc76baba3adf0d0f99df0e44ba57 from master