Merge from vendor branch TNFTP: