Merge "Replace HashSet with ArraySet in RaParams" into main