synched to Impacket r1102 and r1086