After merge from NS