!UPSTREAM: Fix bug 69054

TODO:
- Test on NVIDIA