Merge "[Catalyst] Support Set API" into main