WP-4321: update field class.