Merge "Start using some better sorting for intent resolution" into mnc-dev