Change condition to use relative rank

No functional change
Merge branch 'master' into qs_fut_pv