Merge "Enable policy ranking" into sc-dev