Fixed ambiguous statements in the UniqueHashMap create factories
Merge remote-tracking branch 'origin/master'