Change 14649

Request Review
Pull 12.1 fixes to main

Integration only change
2 edited 0 added 0 deleted
Tip: Use n and p to cycle through the changes.