Merge remote-tracking branch 'origin/feature/elasticsearch' into develop