Merged Esri internal TFS content.