WP-3395: update field order.
WP-3395: update field wrapper.