Merge "Re-enable NS primitives"