Merge "Improve hidden field validation"