WP-3394: update field order.