Merge "[OOF] Add CSIT for NSI/NSSI selection"