totally remove sanitization contenthandler
Merge branch 'aloha-update' into dev