WP-2532 Pulling in base and case_ct