stable 21.0 ssbo fix

Looks like I grabbed the wrong sha for the ssbo Fixes so it got missed for merge to stable branches.

Untested, just a straight cherry-pick -x.