CTO works properly and no longer deals porn damage
Merge branch 'master' into click_interactions