Merged from master branch
Improved performances of popularity scorers