Merge from vendor branch NTPD: