K 10 svn:author V 3 imp K 8 svn:date V 27 2017-08-29T15:46:34.546025Z K 7 svn:log V 245 Fix a few overlooked spots where the coded uses 16-bit NSIDs. Chuck Tuffli had submitted a more thorough patch that I was unaware of when I did my work and this brings in the bits I missed from that patch. PR: 220267 Submitted by: Chuck Tuffli END