Review edits for DATAREST-219 (DO NOT MERGE)

This PR is for review purposes only. Do NOT merge into PRODUCTION.