Some changes were made to a feature branch that were merged in and released separately from our main branch. The changes are present here: #44649

The task at hand is to port over all of the changes in that pull request so that the feature branch and main branches both have those changes.