WP-3380: update date field order.
WP-3380: update field group wrapper.