Merge changes Ib5cd2c27,I4448a354 into sc-dev

* changes:
  [NS10] Fix a bug where registerIgnoringScore is broken
  [NS09] Implement the new ranking code