Merge "Fix to OrderedSetTemplate, preference for autocompletion"