Merge branch 'MDL-27845_rating_aggregation'