Merge "Change URI type metadata back to text" into lmp-dev