speedup build
Merge remote-tracking branch 'origin/0.9-devel-esri' into 0.9-devel-esri