Improver Sonar score (just for fun :-)
NDRPacket => NDRWriter
Fixed merge conflict(?)