merge from samba4