Merge "[Catalyst] Support sensitivity level" into main