Request for review of gh-114918 and gh-114818

I have two pull requests that I opened around a year ago that could still use a core review.

The Pull Requests are: