resorting
Merge remote-tracking branch 'geosurvey/solomon' into solomon