Commit for review by @lefticus

[#75135164]