I added the patch on top of our 2021.07 branch and submitted it to Factory https://build.opensuse.org/request/show/909899