2.21.1 Cherrypicks

Package Merge Request

Package Changes

Patch release 2.21.1 cherrypicks

Package MR

N/A

For Issue

Closes #1959 (closed)

Upgrade Notices

N/A

changed milestone to %2.21.1

added statusreview label

requested review from @ryan.j.garcia, @michaelmartin, and @chris.oconnell

assigned to @nicole.dupree

changed the description

approved this merge request

enabled an automatic merge when the pipeline for 5b70d038 succeeds

merged

mentioned in commit db6d8319