WP-2803: changes for cases.