pulling update from ESRI

pulling update from ESRI