r675: merge from SAMBA_4_0: