Follow up on code review (contentcomments)