[merge from SAMBA_3_0]