Merge remote-tracking branch 'arjansh/bug/fieldnames-with-dots-in-elasticsearch'