Merge "Add functionalities to support NSSI selection"