sync with SAMBA_2_2