Fixed issue with custom fields not saving.
Merge branch '3.4'

* 3.4:
  Fixed issue with custom fields not saving.