bug fix to add required fields inside a FieldSet having proper validation
optimization module_init
Merge branch 'module_init_optimization'
Merge branch 'upstream/master'