r4573: merge -r 4572 from SAMBA_4_0: