1.54 cherrypick

General MR

Summary

merges in 1.54 changes to master.

requested review from @micah.nagel and @ryan.j.garcia

assigned to @jfoster

changed milestone to %1.54.0

added statusreview label

approved this merge request

merged

mentioned in commit e5043a64