Merge pull request #22817 from totten/5.47-rest-q