merged all from geocat 2.2.x (05eec487fd7c61594fb064d536b106c4c8187223)