Merge "Prefix comment table when adding indexes"