Merge "Replace HashSet with memory efficient ArraySet collection" into tm-dev