replacing mix with kiss
Merge master into 67_insights.