Merge "HTMLForm code style fixes"