Sync'd to v14.01.29 from rbwatson's repo

Sync up the changes