WP-3985 Initial commit of new ct