Merge "Improve handling of the required argument in HTMLForm field definitions"