More sync between HEAD and SAMBA_3_0