publish: Merge pull request #81 from prabinv/22017_RatingBugFixes

generated from commit 7613f4485524f12f316249ae52a0dd15481fbdf0