Merge branch 'V20220718.patch' into fix-gpu-down