Merge pull request #18765 from totten/5.31-res-alias