Merge "Non-MySQL comment table updates"