Merge "nsPrefix changes in msb"