Merge pull request #2522 from sr-gi/202308-set-feature