Merge "Update more forms to limit comments by codepoints rather than bytes"