Merge "Improve license scan result"