WP-3379: adjust field order.
WP-3379: update field group wrapper.