Merge "fixes in NsAttrib"