Added another smart name removal pass before disambiguation.
Merge remote-tracking branch: upstream/master