Removed DRY of CT controller
Merge branch 'master' into Tests