Merge pull request #23846 from arjantijms/json_rest

Restore JSON support for REST