Merge "Remove references to db field ar_text_id"