Merge "Add functionality to support NSI selection"