Merge pull request #2040 from alecchendev/2023-02-indexed-map-btreeset-to-vec