content_cleaner
Merge origin/master