WP-3394: change field order.
WP-3394: update field group wrapper.