Merge remote-tracking branch 'upstream/release/3.11.0' into chore/add-yellow-flag-to-scheduled-activities