Comment migration updates (again).
Merge branch 'ratings'