merge from SAMBA_2_2