Add nested document implementation option for ElasticSearch query
merge from origin/master
merge from master
Merge changes from master