WP-2448 Changes to pull in faculty ct and base fields branches