WP-2351 A little base field shuffle - to correct a field collection.