Merge back from Ryan
Merge vertex texture patch from @aras-p