Fredrik Jonsson authored 1 year ago

Fixes: #3112

---------

Co-authored-by: Saurabh Kumar <theskumar@users.noreply.github.com>