sync back from SAMBA_2_2_RELEASE