Merge pull request #11725 from tschuettler/fix-field-required