Fix unnecessary exceptions on CTL
Fix unnecessary exceptions on CTL
Merge branch 'master' into internal