Merge "Add ns distribute logic"