[backport 3.2] Backport #7241 and #8027#8293
Open
davebayer wants to merge 2 commits intoNVIDIA:branch/3.2.xfrom
Open
[backport 3.2] Backport #7241 and #8027#8293davebayer wants to merge 2 commits intoNVIDIA:branch/3.2.xfrom
davebayer wants to merge 2 commits intoNVIDIA:branch/3.2.xfrom