temporarily removed  two new fields because samba needs a patch downstream