Manual sweep of !61505 (merged) from 21.0 to 23.0.
See original MR for full description.
Tagging @nyoung