These changes are not very useful on their own, but committed in order to make PR #109522 easier to review