fwiw I'm testing this backport in-place in openSUSE:Step:15-SP3 right now (first attempt at testing was wrong, currently recovering from that)