Merge from geocat 2.2.x branch