Merge "Add API layer for NSSI selection"