Merge "Restore func_get_args in HTMLFormField"