Cherry pick 86331, 86332, 86335, 86342 The merge from main in 86816 undid the last set of changes, so hopefully reapplying them here Putting on a branch in case things get too weird