Merge "Update character limits"