r24552: merge from SAMBA_4_0: