Branch for custom fields formats refactoring.
Authored by: jplang 2013-11-16
Parent: [r12289]
Child: [r12291]