Merge branch 'trend' into sonots