Mrisho Lukamba authored 1 month ago and Sebastian Kunert committed 3 weeks ago

Closes #7573

@skunert  @bkchr



---------

Co-authored-by: Bastian Köcher <git@kchr.de>
Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Sebastian Kunert <skunert49@gmail.com>
(cherry picked from commit e64b53c2)