Merge "Update char limit" into main