Merge UDT v4 changes into master