Merge remote-tracking branch 'upstream/release/3.11.0' into fix/null-evaluating-groupsBar-wrappedInstance