WP-3499: update field order.
WP-3499: update field order with wrapper.