WP-2357 Added branch for working paper ct changes