merges from SAMBA_2_2