Merged geocat_1.1.x up to commit: 0b11d56f368841c5a937a2377873ac37a5366a8e