the fix
Merge branch 'rating-hotfix' into staging