WP-2482 Several changes to the faculty ct
WP-2482 Several changes to the faculty ct