* chore: cherry-pick 2 changes from 1-M130 * chore: cherry-pick 1 change from 2-M130
chore: backport 18 changes from 2-M127 to 1-M129 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>