Merge "Change API layer for NSI selection"