conflicts fixed between master and hmu/api_comments_clean