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