Merge samba4