Follow-up commit to REPORT-704 following code review comments.