Merged custom fields format refactoring.
Authored by: jplang 2013-12-14
Parent: [r12399]
Child: [r12401]