many changes to the recommender
Merge commit '324ea10dfbde7a94fddd2f981e5caa019ea90091'