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