Merge "Fix global finding logic."