Merge "BUG-1493: do not instantiate HashSet"