Re-apply Missing Fixes from #3647 and Forward-Merge 2.16
to master
#2158
This run and associated checks have been archived and are scheduled for deletion.
Learn more about checks retention