Gazetteer out join handler
Merge branch 'features/join-handlers' into develop