Merge "Fix some issues with HTMLSelectAndOtherField default and validation"