WP-2069 Picking up recent changes for field_formatter and phd ct