Merge "Adding NS instantiation"