first pass at updating head branch to be to be the same as the SAMBA_2_0 branch