mapped missing fields
Merge branch 'config_binding_fix'

* config_binding_fix:
  mapped missing fields