Merge "Ns descriptor related stuffs."