Merge "Remove references to field rev_text_id"