case-3139 - Rating changes
Merge branch 'case-3139' into development