WP-3773: Patch field collection to validate required fields properly.