Merge "Tweak ordering of first match search" into sc-dev