Merge "Better heuristic to find license types"