DBC 1134 - Fix ranking mechanism.
Merge branch 'DBC-1134' into develop