Fixes #69882 Closes #83853 Fixes #85855 Fixes #85856 (cherry picked from commit c3f87b31d1)
c3f87b31d1