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