Merge "Clean up ar_usertext_timestamp index mess"