diff --git a/build.gradle b/build.gradle
index e1ab4576639..2bda78cd1c4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -112,7 +112,6 @@ subprojects {
     "org.elasticsearch.distribution.deb:elasticsearch:${version}": ':distribution:deb',
     "org.elasticsearch.test:logger-usage:${version}": ':test:logger-usage',
     // for transport client
-    "org.elasticsearch.plugin:transport-netty3-client:${version}": ':modules:transport-netty3',
     "org.elasticsearch.plugin:transport-netty4-client:${version}": ':modules:transport-netty4',
     "org.elasticsearch.plugin:reindex-client:${version}": ':modules:reindex',
     "org.elasticsearch.plugin:lang-mustache-client:${version}": ':modules:lang-mustache',
diff --git a/buildSrc/src/main/resources/checkstyle.xml b/buildSrc/src/main/resources/checkstyle.xml
index 706ef46ffa1..891a85d50a9 100644
--- a/buildSrc/src/main/resources/checkstyle.xml
+++ b/buildSrc/src/main/resources/checkstyle.xml
@@ -10,6 +10,13 @@
     <property name="file" value="${suppressions}" />
   </module>
 
+  <!-- Checks Java files and forbids empty Javadoc comments -->
+  <module name="RegexpMultiline">
+    <property name="format" value="\/\*[\s\*]*\*\/"/>
+    <property name="fileExtensions" value="java"/>
+    <property name="message" value="Empty javadoc comments are forbidden"/>
+  </module>
+
   <module name="TreeWalker">
     <!-- Its our official line length! See checkstyle_suppressions.xml for the files that don't pass this. For now we
       suppress the check there but enforce it everywhere else. This prevents the list from getting longer even if it is
diff --git a/buildSrc/src/main/resources/checkstyle_suppressions.xml b/buildSrc/src/main/resources/checkstyle_suppressions.xml
index 62e9eec224d..28443f7ff47 100644
--- a/buildSrc/src/main/resources/checkstyle_suppressions.xml
+++ b/buildSrc/src/main/resources/checkstyle_suppressions.xml
@@ -968,14 +968,6 @@
   <suppress files="plugins[/\\]discovery-ec2[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]cloud[/\\]aws[/\\]AbstractAwsTestCase.java" checks="LineLength" />
   <suppress files="plugins[/\\]discovery-ec2[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]discovery[/\\]ec2[/\\]AmazonEC2Mock.java" checks="LineLength" />
   <suppress files="plugins[/\\]discovery-gce[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]discovery[/\\]gce[/\\]GceNetworkTests.java" checks="LineLength" />
-  <suppress files="plugins[/\\]lang-javascript[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]script[/\\]javascript[/\\]JavaScriptScriptEngineService.java" checks="LineLength" />
-  <suppress files="plugins[/\\]lang-javascript[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]script[/\\]javascript[/\\]JavaScriptScriptEngineTests.java" checks="LineLength" />
-  <suppress files="plugins[/\\]lang-javascript[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]script[/\\]javascript[/\\]JavaScriptScriptMultiThreadedTests.java" checks="LineLength" />
-  <suppress files="plugins[/\\]lang-javascript[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]script[/\\]javascript[/\\]JavaScriptSecurityTests.java" checks="LineLength" />
-  <suppress files="plugins[/\\]lang-javascript[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]script[/\\]javascript[/\\]SimpleBench.java" checks="LineLength" />
-  <suppress files="plugins[/\\]lang-python[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]script[/\\]python[/\\]PythonScriptEngineTests.java" checks="LineLength" />
-  <suppress files="plugins[/\\]lang-python[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]script[/\\]python[/\\]PythonScriptMultiThreadedTests.java" checks="LineLength" />
-  <suppress files="plugins[/\\]lang-python[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]script[/\\]python[/\\]PythonSecurityTests.java" checks="LineLength" />
   <suppress files="plugins[/\\]mapper-murmur3[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]index[/\\]mapper[/\\]murmur3[/\\]Murmur3FieldMapper.java" checks="LineLength" />
   <suppress files="plugins[/\\]mapper-murmur3[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]index[/\\]mapper[/\\]murmur3[/\\]Murmur3FieldMapperTests.java" checks="LineLength" />
   <suppress files="plugins[/\\]mapper-murmur3[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]index[/\\]mapper[/\\]murmur3[/\\]Murmur3FieldMapperUpgradeTests.java" checks="LineLength" />
diff --git a/core/src/main/java/org/elasticsearch/ElasticsearchException.java b/core/src/main/java/org/elasticsearch/ElasticsearchException.java
index 9b6bc54b045..a4befb67d4a 100644
--- a/core/src/main/java/org/elasticsearch/ElasticsearchException.java
+++ b/core/src/main/java/org/elasticsearch/ElasticsearchException.java
@@ -49,6 +49,8 @@ import static org.elasticsearch.cluster.metadata.IndexMetaData.INDEX_UUID_NA_VAL
  */
 public class ElasticsearchException extends RuntimeException implements ToXContent, Writeable {
 
+    public static final Version V_5_1_0_UNRELEASED = Version.fromId(5010099);
+    public static final Version UNKNOWN_VERSION_ADDED = Version.fromId(0);
     public static final String REST_EXCEPTION_SKIP_CAUSE = "rest.exception.cause.skip";
     public static final String REST_EXCEPTION_SKIP_STACK_TRACE = "rest.exception.stacktrace.skip";
     public static final boolean REST_EXCEPTION_SKIP_STACK_TRACE_DEFAULT = true;
@@ -210,8 +212,12 @@ public class ElasticsearchException extends RuntimeException implements ToXConte
     /**
      * Returns <code>true</code> iff the given class is a registered for an exception to be read.
      */
-    public static boolean isRegistered(Class<? extends Throwable> exception) {
-        return CLASS_TO_ELASTICSEARCH_EXCEPTION_HANDLE.containsKey(exception);
+    public static boolean isRegistered(Class<? extends Throwable> exception, Version version) {
+        ElasticsearchExceptionHandle elasticsearchExceptionHandle = CLASS_TO_ELASTICSEARCH_EXCEPTION_HANDLE.get(exception);
+        if (elasticsearchExceptionHandle != null) {
+            return version.onOrAfter(elasticsearchExceptionHandle.versionAdded);
+        }
+        return false;
     }
 
     static Set<Class<? extends ElasticsearchException>> getRegisteredKeys() { // for testing
@@ -432,279 +438,294 @@ public class ElasticsearchException extends RuntimeException implements ToXConte
      */
     enum ElasticsearchExceptionHandle {
         INDEX_SHARD_SNAPSHOT_FAILED_EXCEPTION(org.elasticsearch.index.snapshots.IndexShardSnapshotFailedException.class,
-                org.elasticsearch.index.snapshots.IndexShardSnapshotFailedException::new, 0),
+                org.elasticsearch.index.snapshots.IndexShardSnapshotFailedException::new, 0, UNKNOWN_VERSION_ADDED),
         DFS_PHASE_EXECUTION_EXCEPTION(org.elasticsearch.search.dfs.DfsPhaseExecutionException.class,
-                org.elasticsearch.search.dfs.DfsPhaseExecutionException::new, 1),
+                org.elasticsearch.search.dfs.DfsPhaseExecutionException::new, 1, UNKNOWN_VERSION_ADDED),
         EXECUTION_CANCELLED_EXCEPTION(org.elasticsearch.common.util.CancellableThreads.ExecutionCancelledException.class,
-                org.elasticsearch.common.util.CancellableThreads.ExecutionCancelledException::new, 2),
+                org.elasticsearch.common.util.CancellableThreads.ExecutionCancelledException::new, 2, UNKNOWN_VERSION_ADDED),
         MASTER_NOT_DISCOVERED_EXCEPTION(org.elasticsearch.discovery.MasterNotDiscoveredException.class,
-                org.elasticsearch.discovery.MasterNotDiscoveredException::new, 3),
+                org.elasticsearch.discovery.MasterNotDiscoveredException::new, 3, UNKNOWN_VERSION_ADDED),
         ELASTICSEARCH_SECURITY_EXCEPTION(org.elasticsearch.ElasticsearchSecurityException.class,
-                org.elasticsearch.ElasticsearchSecurityException::new, 4),
+                org.elasticsearch.ElasticsearchSecurityException::new, 4, UNKNOWN_VERSION_ADDED),
         INDEX_SHARD_RESTORE_EXCEPTION(org.elasticsearch.index.snapshots.IndexShardRestoreException.class,
-                org.elasticsearch.index.snapshots.IndexShardRestoreException::new, 5),
+                org.elasticsearch.index.snapshots.IndexShardRestoreException::new, 5, UNKNOWN_VERSION_ADDED),
         INDEX_CLOSED_EXCEPTION(org.elasticsearch.indices.IndexClosedException.class,
-                org.elasticsearch.indices.IndexClosedException::new, 6),
+                org.elasticsearch.indices.IndexClosedException::new, 6, UNKNOWN_VERSION_ADDED),
         BIND_HTTP_EXCEPTION(org.elasticsearch.http.BindHttpException.class,
-                org.elasticsearch.http.BindHttpException::new, 7),
+                org.elasticsearch.http.BindHttpException::new, 7, UNKNOWN_VERSION_ADDED),
         REDUCE_SEARCH_PHASE_EXCEPTION(org.elasticsearch.action.search.ReduceSearchPhaseException.class,
-                org.elasticsearch.action.search.ReduceSearchPhaseException::new, 8),
+                org.elasticsearch.action.search.ReduceSearchPhaseException::new, 8, UNKNOWN_VERSION_ADDED),
         NODE_CLOSED_EXCEPTION(org.elasticsearch.node.NodeClosedException.class,
-                org.elasticsearch.node.NodeClosedException::new, 9),
+                org.elasticsearch.node.NodeClosedException::new, 9, UNKNOWN_VERSION_ADDED),
         SNAPSHOT_FAILED_ENGINE_EXCEPTION(org.elasticsearch.index.engine.SnapshotFailedEngineException.class,
-                org.elasticsearch.index.engine.SnapshotFailedEngineException::new, 10),
+                org.elasticsearch.index.engine.SnapshotFailedEngineException::new, 10, UNKNOWN_VERSION_ADDED),
         SHARD_NOT_FOUND_EXCEPTION(org.elasticsearch.index.shard.ShardNotFoundException.class,
-                org.elasticsearch.index.shard.ShardNotFoundException::new, 11),
+                org.elasticsearch.index.shard.ShardNotFoundException::new, 11, UNKNOWN_VERSION_ADDED),
         CONNECT_TRANSPORT_EXCEPTION(org.elasticsearch.transport.ConnectTransportException.class,
-                org.elasticsearch.transport.ConnectTransportException::new, 12),
+                org.elasticsearch.transport.ConnectTransportException::new, 12, UNKNOWN_VERSION_ADDED),
         NOT_SERIALIZABLE_TRANSPORT_EXCEPTION(org.elasticsearch.transport.NotSerializableTransportException.class,
-                org.elasticsearch.transport.NotSerializableTransportException::new, 13),
+                org.elasticsearch.transport.NotSerializableTransportException::new, 13, UNKNOWN_VERSION_ADDED),
         RESPONSE_HANDLER_FAILURE_TRANSPORT_EXCEPTION(org.elasticsearch.transport.ResponseHandlerFailureTransportException.class,
-                org.elasticsearch.transport.ResponseHandlerFailureTransportException::new, 14),
+                org.elasticsearch.transport.ResponseHandlerFailureTransportException::new, 14, UNKNOWN_VERSION_ADDED),
         INDEX_CREATION_EXCEPTION(org.elasticsearch.indices.IndexCreationException.class,
-                org.elasticsearch.indices.IndexCreationException::new, 15),
+                org.elasticsearch.indices.IndexCreationException::new, 15, UNKNOWN_VERSION_ADDED),
         INDEX_NOT_FOUND_EXCEPTION(org.elasticsearch.index.IndexNotFoundException.class,
-                org.elasticsearch.index.IndexNotFoundException::new, 16),
+                org.elasticsearch.index.IndexNotFoundException::new, 16, UNKNOWN_VERSION_ADDED),
         ILLEGAL_SHARD_ROUTING_STATE_EXCEPTION(org.elasticsearch.cluster.routing.IllegalShardRoutingStateException.class,
-                org.elasticsearch.cluster.routing.IllegalShardRoutingStateException::new, 17),
+                org.elasticsearch.cluster.routing.IllegalShardRoutingStateException::new, 17, UNKNOWN_VERSION_ADDED),
         BROADCAST_SHARD_OPERATION_FAILED_EXCEPTION(org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException.class,
-                org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException::new, 18),
+                org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException::new, 18, UNKNOWN_VERSION_ADDED),
         RESOURCE_NOT_FOUND_EXCEPTION(org.elasticsearch.ResourceNotFoundException.class,
-                org.elasticsearch.ResourceNotFoundException::new, 19),
+                org.elasticsearch.ResourceNotFoundException::new, 19, UNKNOWN_VERSION_ADDED),
         ACTION_TRANSPORT_EXCEPTION(org.elasticsearch.transport.ActionTransportException.class,
-                org.elasticsearch.transport.ActionTransportException::new, 20),
+                org.elasticsearch.transport.ActionTransportException::new, 20, UNKNOWN_VERSION_ADDED),
         ELASTICSEARCH_GENERATION_EXCEPTION(org.elasticsearch.ElasticsearchGenerationException.class,
-                org.elasticsearch.ElasticsearchGenerationException::new, 21),
+                org.elasticsearch.ElasticsearchGenerationException::new, 21, UNKNOWN_VERSION_ADDED),
         //      22 was CreateFailedEngineException
         INDEX_SHARD_STARTED_EXCEPTION(org.elasticsearch.index.shard.IndexShardStartedException.class,
-                org.elasticsearch.index.shard.IndexShardStartedException::new, 23),
+                org.elasticsearch.index.shard.IndexShardStartedException::new, 23, UNKNOWN_VERSION_ADDED),
         SEARCH_CONTEXT_MISSING_EXCEPTION(org.elasticsearch.search.SearchContextMissingException.class,
-                org.elasticsearch.search.SearchContextMissingException::new, 24),
+                org.elasticsearch.search.SearchContextMissingException::new, 24, UNKNOWN_VERSION_ADDED),
         GENERAL_SCRIPT_EXCEPTION(org.elasticsearch.script.GeneralScriptException.class,
-                org.elasticsearch.script.GeneralScriptException::new, 25),
+                org.elasticsearch.script.GeneralScriptException::new, 25, UNKNOWN_VERSION_ADDED),
         BATCH_OPERATION_EXCEPTION(org.elasticsearch.index.shard.TranslogRecoveryPerformer.BatchOperationException.class,
-                org.elasticsearch.index.shard.TranslogRecoveryPerformer.BatchOperationException::new, 26),
+                org.elasticsearch.index.shard.TranslogRecoveryPerformer.BatchOperationException::new, 26, UNKNOWN_VERSION_ADDED),
         SNAPSHOT_CREATION_EXCEPTION(org.elasticsearch.snapshots.SnapshotCreationException.class,
-                org.elasticsearch.snapshots.SnapshotCreationException::new, 27),
-        DELETE_FAILED_ENGINE_EXCEPTION(org.elasticsearch.index.engine.DeleteFailedEngineException.class,
-                org.elasticsearch.index.engine.DeleteFailedEngineException::new, 28),// deprecated in 6.0, remove in 7.0
+                org.elasticsearch.snapshots.SnapshotCreationException::new, 27, UNKNOWN_VERSION_ADDED),
+        DELETE_FAILED_ENGINE_EXCEPTION(org.elasticsearch.index.engine.DeleteFailedEngineException.class, // deprecated in 6.0, remove in 7.0
+                org.elasticsearch.index.engine.DeleteFailedEngineException::new, 28, UNKNOWN_VERSION_ADDED),
         DOCUMENT_MISSING_EXCEPTION(org.elasticsearch.index.engine.DocumentMissingException.class,
-                org.elasticsearch.index.engine.DocumentMissingException::new, 29),
+                org.elasticsearch.index.engine.DocumentMissingException::new, 29, UNKNOWN_VERSION_ADDED),
         SNAPSHOT_EXCEPTION(org.elasticsearch.snapshots.SnapshotException.class,
-                org.elasticsearch.snapshots.SnapshotException::new, 30),
+                org.elasticsearch.snapshots.SnapshotException::new, 30, UNKNOWN_VERSION_ADDED),
         INVALID_ALIAS_NAME_EXCEPTION(org.elasticsearch.indices.InvalidAliasNameException.class,
-                org.elasticsearch.indices.InvalidAliasNameException::new, 31),
+                org.elasticsearch.indices.InvalidAliasNameException::new, 31, UNKNOWN_VERSION_ADDED),
         INVALID_INDEX_NAME_EXCEPTION(org.elasticsearch.indices.InvalidIndexNameException.class,
-                org.elasticsearch.indices.InvalidIndexNameException::new, 32),
+                org.elasticsearch.indices.InvalidIndexNameException::new, 32, UNKNOWN_VERSION_ADDED),
         INDEX_PRIMARY_SHARD_NOT_ALLOCATED_EXCEPTION(org.elasticsearch.indices.IndexPrimaryShardNotAllocatedException.class,
-                org.elasticsearch.indices.IndexPrimaryShardNotAllocatedException::new, 33),
+                org.elasticsearch.indices.IndexPrimaryShardNotAllocatedException::new, 33, UNKNOWN_VERSION_ADDED),
         TRANSPORT_EXCEPTION(org.elasticsearch.transport.TransportException.class,
-                org.elasticsearch.transport.TransportException::new, 34),
+                org.elasticsearch.transport.TransportException::new, 34, UNKNOWN_VERSION_ADDED),
         ELASTICSEARCH_PARSE_EXCEPTION(org.elasticsearch.ElasticsearchParseException.class,
-                org.elasticsearch.ElasticsearchParseException::new, 35),
+                org.elasticsearch.ElasticsearchParseException::new, 35, UNKNOWN_VERSION_ADDED),
         SEARCH_EXCEPTION(org.elasticsearch.search.SearchException.class,
-                org.elasticsearch.search.SearchException::new, 36),
+                org.elasticsearch.search.SearchException::new, 36, UNKNOWN_VERSION_ADDED),
         MAPPER_EXCEPTION(org.elasticsearch.index.mapper.MapperException.class,
-                org.elasticsearch.index.mapper.MapperException::new, 37),
+                org.elasticsearch.index.mapper.MapperException::new, 37, UNKNOWN_VERSION_ADDED),
         INVALID_TYPE_NAME_EXCEPTION(org.elasticsearch.indices.InvalidTypeNameException.class,
-                org.elasticsearch.indices.InvalidTypeNameException::new, 38),
+                org.elasticsearch.indices.InvalidTypeNameException::new, 38, UNKNOWN_VERSION_ADDED),
         SNAPSHOT_RESTORE_EXCEPTION(org.elasticsearch.snapshots.SnapshotRestoreException.class,
-                org.elasticsearch.snapshots.SnapshotRestoreException::new, 39),
-        PARSING_EXCEPTION(org.elasticsearch.common.ParsingException.class, org.elasticsearch.common.ParsingException::new, 40),
+                org.elasticsearch.snapshots.SnapshotRestoreException::new, 39, UNKNOWN_VERSION_ADDED),
+        PARSING_EXCEPTION(org.elasticsearch.common.ParsingException.class, org.elasticsearch.common.ParsingException::new, 40,
+            UNKNOWN_VERSION_ADDED),
         INDEX_SHARD_CLOSED_EXCEPTION(org.elasticsearch.index.shard.IndexShardClosedException.class,
-                org.elasticsearch.index.shard.IndexShardClosedException::new, 41),
+                org.elasticsearch.index.shard.IndexShardClosedException::new, 41, UNKNOWN_VERSION_ADDED),
         RECOVER_FILES_RECOVERY_EXCEPTION(org.elasticsearch.indices.recovery.RecoverFilesRecoveryException.class,
-                org.elasticsearch.indices.recovery.RecoverFilesRecoveryException::new, 42),
+                org.elasticsearch.indices.recovery.RecoverFilesRecoveryException::new, 42, UNKNOWN_VERSION_ADDED),
         TRUNCATED_TRANSLOG_EXCEPTION(org.elasticsearch.index.translog.TruncatedTranslogException.class,
-                org.elasticsearch.index.translog.TruncatedTranslogException::new, 43),
+                org.elasticsearch.index.translog.TruncatedTranslogException::new, 43, UNKNOWN_VERSION_ADDED),
         RECOVERY_FAILED_EXCEPTION(org.elasticsearch.indices.recovery.RecoveryFailedException.class,
-                org.elasticsearch.indices.recovery.RecoveryFailedException::new, 44),
+                org.elasticsearch.indices.recovery.RecoveryFailedException::new, 44, UNKNOWN_VERSION_ADDED),
         INDEX_SHARD_RELOCATED_EXCEPTION(org.elasticsearch.index.shard.IndexShardRelocatedException.class,
-                org.elasticsearch.index.shard.IndexShardRelocatedException::new, 45),
+                org.elasticsearch.index.shard.IndexShardRelocatedException::new, 45, UNKNOWN_VERSION_ADDED),
         NODE_SHOULD_NOT_CONNECT_EXCEPTION(org.elasticsearch.transport.NodeShouldNotConnectException.class,
-                org.elasticsearch.transport.NodeShouldNotConnectException::new, 46),
+                org.elasticsearch.transport.NodeShouldNotConnectException::new, 46, UNKNOWN_VERSION_ADDED),
         // 47 used to be for IndexTemplateAlreadyExistsException which was deprecated in 5.1 removed in 6.0
         TRANSLOG_CORRUPTED_EXCEPTION(org.elasticsearch.index.translog.TranslogCorruptedException.class,
-                org.elasticsearch.index.translog.TranslogCorruptedException::new, 48),
+                org.elasticsearch.index.translog.TranslogCorruptedException::new, 48, UNKNOWN_VERSION_ADDED),
         CLUSTER_BLOCK_EXCEPTION(org.elasticsearch.cluster.block.ClusterBlockException.class,
-                org.elasticsearch.cluster.block.ClusterBlockException::new, 49),
+                org.elasticsearch.cluster.block.ClusterBlockException::new, 49, UNKNOWN_VERSION_ADDED),
         FETCH_PHASE_EXECUTION_EXCEPTION(org.elasticsearch.search.fetch.FetchPhaseExecutionException.class,
-                org.elasticsearch.search.fetch.FetchPhaseExecutionException::new, 50),
+                org.elasticsearch.search.fetch.FetchPhaseExecutionException::new, 50, UNKNOWN_VERSION_ADDED),
         // 51 used to be for IndexShardAlreadyExistsException which was deprecated in 5.1 removed in 6.0
         VERSION_CONFLICT_ENGINE_EXCEPTION(org.elasticsearch.index.engine.VersionConflictEngineException.class,
-                org.elasticsearch.index.engine.VersionConflictEngineException::new, 52),
-        ENGINE_EXCEPTION(org.elasticsearch.index.engine.EngineException.class, org.elasticsearch.index.engine.EngineException::new, 53),
+                org.elasticsearch.index.engine.VersionConflictEngineException::new, 52, UNKNOWN_VERSION_ADDED),
+        ENGINE_EXCEPTION(org.elasticsearch.index.engine.EngineException.class, org.elasticsearch.index.engine.EngineException::new, 53,
+            UNKNOWN_VERSION_ADDED),
         // 54 was DocumentAlreadyExistsException, which is superseded by VersionConflictEngineException
-        NO_SUCH_NODE_EXCEPTION(org.elasticsearch.action.NoSuchNodeException.class, org.elasticsearch.action.NoSuchNodeException::new, 55),
+        NO_SUCH_NODE_EXCEPTION(org.elasticsearch.action.NoSuchNodeException.class, org.elasticsearch.action.NoSuchNodeException::new, 55,
+            UNKNOWN_VERSION_ADDED),
         SETTINGS_EXCEPTION(org.elasticsearch.common.settings.SettingsException.class,
-                org.elasticsearch.common.settings.SettingsException::new, 56),
+                org.elasticsearch.common.settings.SettingsException::new, 56, UNKNOWN_VERSION_ADDED),
         INDEX_TEMPLATE_MISSING_EXCEPTION(org.elasticsearch.indices.IndexTemplateMissingException.class,
-                org.elasticsearch.indices.IndexTemplateMissingException::new, 57),
+                org.elasticsearch.indices.IndexTemplateMissingException::new, 57, UNKNOWN_VERSION_ADDED),
         SEND_REQUEST_TRANSPORT_EXCEPTION(org.elasticsearch.transport.SendRequestTransportException.class,
-                org.elasticsearch.transport.SendRequestTransportException::new, 58),
+                org.elasticsearch.transport.SendRequestTransportException::new, 58, UNKNOWN_VERSION_ADDED),
         ES_REJECTED_EXECUTION_EXCEPTION(org.elasticsearch.common.util.concurrent.EsRejectedExecutionException.class,
-                org.elasticsearch.common.util.concurrent.EsRejectedExecutionException::new, 59),
+                org.elasticsearch.common.util.concurrent.EsRejectedExecutionException::new, 59, UNKNOWN_VERSION_ADDED),
         EARLY_TERMINATION_EXCEPTION(org.elasticsearch.common.lucene.Lucene.EarlyTerminationException.class,
-                org.elasticsearch.common.lucene.Lucene.EarlyTerminationException::new, 60),
+                org.elasticsearch.common.lucene.Lucene.EarlyTerminationException::new, 60, UNKNOWN_VERSION_ADDED),
         // 61 used to be for RoutingValidationException
         NOT_SERIALIZABLE_EXCEPTION_WRAPPER(org.elasticsearch.common.io.stream.NotSerializableExceptionWrapper.class,
-                org.elasticsearch.common.io.stream.NotSerializableExceptionWrapper::new, 62),
+                org.elasticsearch.common.io.stream.NotSerializableExceptionWrapper::new, 62, UNKNOWN_VERSION_ADDED),
         ALIAS_FILTER_PARSING_EXCEPTION(org.elasticsearch.indices.AliasFilterParsingException.class,
-                org.elasticsearch.indices.AliasFilterParsingException::new, 63),
+                org.elasticsearch.indices.AliasFilterParsingException::new, 63, UNKNOWN_VERSION_ADDED),
         // 64 was DeleteByQueryFailedEngineException, which was removed in 5.0
-        GATEWAY_EXCEPTION(org.elasticsearch.gateway.GatewayException.class, org.elasticsearch.gateway.GatewayException::new, 65),
+        GATEWAY_EXCEPTION(org.elasticsearch.gateway.GatewayException.class, org.elasticsearch.gateway.GatewayException::new, 65,
+            UNKNOWN_VERSION_ADDED),
         INDEX_SHARD_NOT_RECOVERING_EXCEPTION(org.elasticsearch.index.shard.IndexShardNotRecoveringException.class,
-                org.elasticsearch.index.shard.IndexShardNotRecoveringException::new, 66),
-        HTTP_EXCEPTION(org.elasticsearch.http.HttpException.class, org.elasticsearch.http.HttpException::new, 67),
+                org.elasticsearch.index.shard.IndexShardNotRecoveringException::new, 66, UNKNOWN_VERSION_ADDED),
+        HTTP_EXCEPTION(org.elasticsearch.http.HttpException.class, org.elasticsearch.http.HttpException::new, 67, UNKNOWN_VERSION_ADDED),
         ELASTICSEARCH_EXCEPTION(org.elasticsearch.ElasticsearchException.class,
-                org.elasticsearch.ElasticsearchException::new, 68),
+                org.elasticsearch.ElasticsearchException::new, 68, UNKNOWN_VERSION_ADDED),
         SNAPSHOT_MISSING_EXCEPTION(org.elasticsearch.snapshots.SnapshotMissingException.class,
-                org.elasticsearch.snapshots.SnapshotMissingException::new, 69),
+                org.elasticsearch.snapshots.SnapshotMissingException::new, 69, UNKNOWN_VERSION_ADDED),
         PRIMARY_MISSING_ACTION_EXCEPTION(org.elasticsearch.action.PrimaryMissingActionException.class,
-                org.elasticsearch.action.PrimaryMissingActionException::new, 70),
-        FAILED_NODE_EXCEPTION(org.elasticsearch.action.FailedNodeException.class, org.elasticsearch.action.FailedNodeException::new, 71),
-        SEARCH_PARSE_EXCEPTION(org.elasticsearch.search.SearchParseException.class, org.elasticsearch.search.SearchParseException::new, 72),
+                org.elasticsearch.action.PrimaryMissingActionException::new, 70, UNKNOWN_VERSION_ADDED),
+        FAILED_NODE_EXCEPTION(org.elasticsearch.action.FailedNodeException.class, org.elasticsearch.action.FailedNodeException::new, 71,
+            UNKNOWN_VERSION_ADDED),
+        SEARCH_PARSE_EXCEPTION(org.elasticsearch.search.SearchParseException.class, org.elasticsearch.search.SearchParseException::new, 72,
+            UNKNOWN_VERSION_ADDED),
         CONCURRENT_SNAPSHOT_EXECUTION_EXCEPTION(org.elasticsearch.snapshots.ConcurrentSnapshotExecutionException.class,
-                org.elasticsearch.snapshots.ConcurrentSnapshotExecutionException::new, 73),
+                org.elasticsearch.snapshots.ConcurrentSnapshotExecutionException::new, 73, UNKNOWN_VERSION_ADDED),
         BLOB_STORE_EXCEPTION(org.elasticsearch.common.blobstore.BlobStoreException.class,
-                org.elasticsearch.common.blobstore.BlobStoreException::new, 74),
+                org.elasticsearch.common.blobstore.BlobStoreException::new, 74, UNKNOWN_VERSION_ADDED),
         INCOMPATIBLE_CLUSTER_STATE_VERSION_EXCEPTION(org.elasticsearch.cluster.IncompatibleClusterStateVersionException.class,
-                org.elasticsearch.cluster.IncompatibleClusterStateVersionException::new, 75),
+                org.elasticsearch.cluster.IncompatibleClusterStateVersionException::new, 75, UNKNOWN_VERSION_ADDED),
         RECOVERY_ENGINE_EXCEPTION(org.elasticsearch.index.engine.RecoveryEngineException.class,
-                org.elasticsearch.index.engine.RecoveryEngineException::new, 76),
+                org.elasticsearch.index.engine.RecoveryEngineException::new, 76, UNKNOWN_VERSION_ADDED),
         UNCATEGORIZED_EXECUTION_EXCEPTION(org.elasticsearch.common.util.concurrent.UncategorizedExecutionException.class,
-                org.elasticsearch.common.util.concurrent.UncategorizedExecutionException::new, 77),
+                org.elasticsearch.common.util.concurrent.UncategorizedExecutionException::new, 77, UNKNOWN_VERSION_ADDED),
         TIMESTAMP_PARSING_EXCEPTION(org.elasticsearch.action.TimestampParsingException.class,
-                org.elasticsearch.action.TimestampParsingException::new, 78),
+                org.elasticsearch.action.TimestampParsingException::new, 78, UNKNOWN_VERSION_ADDED),
         ROUTING_MISSING_EXCEPTION(org.elasticsearch.action.RoutingMissingException.class,
-                org.elasticsearch.action.RoutingMissingException::new, 79),
-        INDEX_FAILED_ENGINE_EXCEPTION(org.elasticsearch.index.engine.IndexFailedEngineException.class,
-                org.elasticsearch.index.engine.IndexFailedEngineException::new, 80), // deprecated in 6.0, remove in 7.0
+                org.elasticsearch.action.RoutingMissingException::new, 79, UNKNOWN_VERSION_ADDED),
+        INDEX_FAILED_ENGINE_EXCEPTION(org.elasticsearch.index.engine.IndexFailedEngineException.class, // deprecated in 6.0, remove in 7.0
+                org.elasticsearch.index.engine.IndexFailedEngineException::new, 80, UNKNOWN_VERSION_ADDED),
         INDEX_SHARD_RESTORE_FAILED_EXCEPTION(org.elasticsearch.index.snapshots.IndexShardRestoreFailedException.class,
-                org.elasticsearch.index.snapshots.IndexShardRestoreFailedException::new, 81),
+                org.elasticsearch.index.snapshots.IndexShardRestoreFailedException::new, 81, UNKNOWN_VERSION_ADDED),
         REPOSITORY_EXCEPTION(org.elasticsearch.repositories.RepositoryException.class,
-                org.elasticsearch.repositories.RepositoryException::new, 82),
+                org.elasticsearch.repositories.RepositoryException::new, 82, UNKNOWN_VERSION_ADDED),
         RECEIVE_TIMEOUT_TRANSPORT_EXCEPTION(org.elasticsearch.transport.ReceiveTimeoutTransportException.class,
-                org.elasticsearch.transport.ReceiveTimeoutTransportException::new, 83),
+                org.elasticsearch.transport.ReceiveTimeoutTransportException::new, 83, UNKNOWN_VERSION_ADDED),
         NODE_DISCONNECTED_EXCEPTION(org.elasticsearch.transport.NodeDisconnectedException.class,
-                org.elasticsearch.transport.NodeDisconnectedException::new, 84),
+                org.elasticsearch.transport.NodeDisconnectedException::new, 84, UNKNOWN_VERSION_ADDED),
         ALREADY_EXPIRED_EXCEPTION(org.elasticsearch.index.AlreadyExpiredException.class,
-                org.elasticsearch.index.AlreadyExpiredException::new, 85),
+                org.elasticsearch.index.AlreadyExpiredException::new, 85, UNKNOWN_VERSION_ADDED),
         AGGREGATION_EXECUTION_EXCEPTION(org.elasticsearch.search.aggregations.AggregationExecutionException.class,
-                org.elasticsearch.search.aggregations.AggregationExecutionException::new, 86),
+                org.elasticsearch.search.aggregations.AggregationExecutionException::new, 86, UNKNOWN_VERSION_ADDED),
         // 87 used to be for MergeMappingException
         INVALID_INDEX_TEMPLATE_EXCEPTION(org.elasticsearch.indices.InvalidIndexTemplateException.class,
-                org.elasticsearch.indices.InvalidIndexTemplateException::new, 88),
+                org.elasticsearch.indices.InvalidIndexTemplateException::new, 88, UNKNOWN_VERSION_ADDED),
         REFRESH_FAILED_ENGINE_EXCEPTION(org.elasticsearch.index.engine.RefreshFailedEngineException.class,
-                org.elasticsearch.index.engine.RefreshFailedEngineException::new, 90),
+                org.elasticsearch.index.engine.RefreshFailedEngineException::new, 90, UNKNOWN_VERSION_ADDED),
         AGGREGATION_INITIALIZATION_EXCEPTION(org.elasticsearch.search.aggregations.AggregationInitializationException.class,
-                org.elasticsearch.search.aggregations.AggregationInitializationException::new, 91),
+                org.elasticsearch.search.aggregations.AggregationInitializationException::new, 91, UNKNOWN_VERSION_ADDED),
         DELAY_RECOVERY_EXCEPTION(org.elasticsearch.indices.recovery.DelayRecoveryException.class,
-                org.elasticsearch.indices.recovery.DelayRecoveryException::new, 92),
+                org.elasticsearch.indices.recovery.DelayRecoveryException::new, 92, UNKNOWN_VERSION_ADDED),
         // 93 used to be for IndexWarmerMissingException
         NO_NODE_AVAILABLE_EXCEPTION(org.elasticsearch.client.transport.NoNodeAvailableException.class,
-                org.elasticsearch.client.transport.NoNodeAvailableException::new, 94),
+                org.elasticsearch.client.transport.NoNodeAvailableException::new, 94, UNKNOWN_VERSION_ADDED),
         INVALID_SNAPSHOT_NAME_EXCEPTION(org.elasticsearch.snapshots.InvalidSnapshotNameException.class,
-                org.elasticsearch.snapshots.InvalidSnapshotNameException::new, 96),
+                org.elasticsearch.snapshots.InvalidSnapshotNameException::new, 96, UNKNOWN_VERSION_ADDED),
         ILLEGAL_INDEX_SHARD_STATE_EXCEPTION(org.elasticsearch.index.shard.IllegalIndexShardStateException.class,
-                org.elasticsearch.index.shard.IllegalIndexShardStateException::new, 97),
+                org.elasticsearch.index.shard.IllegalIndexShardStateException::new, 97, UNKNOWN_VERSION_ADDED),
         INDEX_SHARD_SNAPSHOT_EXCEPTION(org.elasticsearch.index.snapshots.IndexShardSnapshotException.class,
-                org.elasticsearch.index.snapshots.IndexShardSnapshotException::new, 98),
+                org.elasticsearch.index.snapshots.IndexShardSnapshotException::new, 98, UNKNOWN_VERSION_ADDED),
         INDEX_SHARD_NOT_STARTED_EXCEPTION(org.elasticsearch.index.shard.IndexShardNotStartedException.class,
-                org.elasticsearch.index.shard.IndexShardNotStartedException::new, 99),
+                org.elasticsearch.index.shard.IndexShardNotStartedException::new, 99, UNKNOWN_VERSION_ADDED),
         SEARCH_PHASE_EXECUTION_EXCEPTION(org.elasticsearch.action.search.SearchPhaseExecutionException.class,
-                org.elasticsearch.action.search.SearchPhaseExecutionException::new, 100),
+                org.elasticsearch.action.search.SearchPhaseExecutionException::new, 100, UNKNOWN_VERSION_ADDED),
         ACTION_NOT_FOUND_TRANSPORT_EXCEPTION(org.elasticsearch.transport.ActionNotFoundTransportException.class,
-                org.elasticsearch.transport.ActionNotFoundTransportException::new, 101),
+                org.elasticsearch.transport.ActionNotFoundTransportException::new, 101, UNKNOWN_VERSION_ADDED),
         TRANSPORT_SERIALIZATION_EXCEPTION(org.elasticsearch.transport.TransportSerializationException.class,
-                org.elasticsearch.transport.TransportSerializationException::new, 102),
+                org.elasticsearch.transport.TransportSerializationException::new, 102, UNKNOWN_VERSION_ADDED),
         REMOTE_TRANSPORT_EXCEPTION(org.elasticsearch.transport.RemoteTransportException.class,
-                org.elasticsearch.transport.RemoteTransportException::new, 103),
+                org.elasticsearch.transport.RemoteTransportException::new, 103, UNKNOWN_VERSION_ADDED),
         ENGINE_CREATION_FAILURE_EXCEPTION(org.elasticsearch.index.engine.EngineCreationFailureException.class,
-                org.elasticsearch.index.engine.EngineCreationFailureException::new, 104),
+                org.elasticsearch.index.engine.EngineCreationFailureException::new, 104, UNKNOWN_VERSION_ADDED),
         ROUTING_EXCEPTION(org.elasticsearch.cluster.routing.RoutingException.class,
-                org.elasticsearch.cluster.routing.RoutingException::new, 105),
+                org.elasticsearch.cluster.routing.RoutingException::new, 105, UNKNOWN_VERSION_ADDED),
         INDEX_SHARD_RECOVERY_EXCEPTION(org.elasticsearch.index.shard.IndexShardRecoveryException.class,
-                org.elasticsearch.index.shard.IndexShardRecoveryException::new, 106),
+                org.elasticsearch.index.shard.IndexShardRecoveryException::new, 106, UNKNOWN_VERSION_ADDED),
         REPOSITORY_MISSING_EXCEPTION(org.elasticsearch.repositories.RepositoryMissingException.class,
-                org.elasticsearch.repositories.RepositoryMissingException::new, 107),
+                org.elasticsearch.repositories.RepositoryMissingException::new, 107, UNKNOWN_VERSION_ADDED),
         DOCUMENT_SOURCE_MISSING_EXCEPTION(org.elasticsearch.index.engine.DocumentSourceMissingException.class,
-                org.elasticsearch.index.engine.DocumentSourceMissingException::new, 109),
+                org.elasticsearch.index.engine.DocumentSourceMissingException::new, 109, UNKNOWN_VERSION_ADDED),
         // 110 used to be FlushNotAllowedEngineException
         NO_CLASS_SETTINGS_EXCEPTION(org.elasticsearch.common.settings.NoClassSettingsException.class,
-                org.elasticsearch.common.settings.NoClassSettingsException::new, 111),
+                org.elasticsearch.common.settings.NoClassSettingsException::new, 111, UNKNOWN_VERSION_ADDED),
         BIND_TRANSPORT_EXCEPTION(org.elasticsearch.transport.BindTransportException.class,
-                org.elasticsearch.transport.BindTransportException::new, 112),
+                org.elasticsearch.transport.BindTransportException::new, 112, UNKNOWN_VERSION_ADDED),
         ALIASES_NOT_FOUND_EXCEPTION(org.elasticsearch.rest.action.admin.indices.AliasesNotFoundException.class,
-                org.elasticsearch.rest.action.admin.indices.AliasesNotFoundException::new, 113),
+                org.elasticsearch.rest.action.admin.indices.AliasesNotFoundException::new, 113, UNKNOWN_VERSION_ADDED),
         INDEX_SHARD_RECOVERING_EXCEPTION(org.elasticsearch.index.shard.IndexShardRecoveringException.class,
-                org.elasticsearch.index.shard.IndexShardRecoveringException::new, 114),
+                org.elasticsearch.index.shard.IndexShardRecoveringException::new, 114, UNKNOWN_VERSION_ADDED),
         TRANSLOG_EXCEPTION(org.elasticsearch.index.translog.TranslogException.class,
-                org.elasticsearch.index.translog.TranslogException::new, 115),
+                org.elasticsearch.index.translog.TranslogException::new, 115, UNKNOWN_VERSION_ADDED),
         PROCESS_CLUSTER_EVENT_TIMEOUT_EXCEPTION(org.elasticsearch.cluster.metadata.ProcessClusterEventTimeoutException.class,
-                org.elasticsearch.cluster.metadata.ProcessClusterEventTimeoutException::new, 116),
+                org.elasticsearch.cluster.metadata.ProcessClusterEventTimeoutException::new, 116, UNKNOWN_VERSION_ADDED),
         RETRY_ON_PRIMARY_EXCEPTION(ReplicationOperation.RetryOnPrimaryException.class,
-                ReplicationOperation.RetryOnPrimaryException::new, 117),
+                ReplicationOperation.RetryOnPrimaryException::new, 117, UNKNOWN_VERSION_ADDED),
         ELASTICSEARCH_TIMEOUT_EXCEPTION(org.elasticsearch.ElasticsearchTimeoutException.class,
-                org.elasticsearch.ElasticsearchTimeoutException::new, 118),
+                org.elasticsearch.ElasticsearchTimeoutException::new, 118, UNKNOWN_VERSION_ADDED),
         QUERY_PHASE_EXECUTION_EXCEPTION(org.elasticsearch.search.query.QueryPhaseExecutionException.class,
-                org.elasticsearch.search.query.QueryPhaseExecutionException::new, 119),
+                org.elasticsearch.search.query.QueryPhaseExecutionException::new, 119, UNKNOWN_VERSION_ADDED),
         REPOSITORY_VERIFICATION_EXCEPTION(org.elasticsearch.repositories.RepositoryVerificationException.class,
-                org.elasticsearch.repositories.RepositoryVerificationException::new, 120),
+                org.elasticsearch.repositories.RepositoryVerificationException::new, 120, UNKNOWN_VERSION_ADDED),
         INVALID_AGGREGATION_PATH_EXCEPTION(org.elasticsearch.search.aggregations.InvalidAggregationPathException.class,
-                org.elasticsearch.search.aggregations.InvalidAggregationPathException::new, 121),
+                org.elasticsearch.search.aggregations.InvalidAggregationPathException::new, 121, UNKNOWN_VERSION_ADDED),
         // 123 used to be IndexAlreadyExistsException and was renamed
         RESOURCE_ALREADY_EXISTS_EXCEPTION(ResourceAlreadyExistsException.class,
-            ResourceAlreadyExistsException::new, 123),
+            ResourceAlreadyExistsException::new, 123, UNKNOWN_VERSION_ADDED),
         // 124 used to be Script.ScriptParseException
         HTTP_ON_TRANSPORT_EXCEPTION(TcpTransport.HttpOnTransportException.class,
-                TcpTransport.HttpOnTransportException::new, 125),
+                TcpTransport.HttpOnTransportException::new, 125, UNKNOWN_VERSION_ADDED),
         MAPPER_PARSING_EXCEPTION(org.elasticsearch.index.mapper.MapperParsingException.class,
-                org.elasticsearch.index.mapper.MapperParsingException::new, 126),
+                org.elasticsearch.index.mapper.MapperParsingException::new, 126, UNKNOWN_VERSION_ADDED),
         SEARCH_CONTEXT_EXCEPTION(org.elasticsearch.search.SearchContextException.class,
-                org.elasticsearch.search.SearchContextException::new, 127),
+                org.elasticsearch.search.SearchContextException::new, 127, UNKNOWN_VERSION_ADDED),
         SEARCH_SOURCE_BUILDER_EXCEPTION(org.elasticsearch.search.builder.SearchSourceBuilderException.class,
-                org.elasticsearch.search.builder.SearchSourceBuilderException::new, 128),
+                org.elasticsearch.search.builder.SearchSourceBuilderException::new, 128, UNKNOWN_VERSION_ADDED),
         ENGINE_CLOSED_EXCEPTION(org.elasticsearch.index.engine.EngineClosedException.class,
-                org.elasticsearch.index.engine.EngineClosedException::new, 129),
+                org.elasticsearch.index.engine.EngineClosedException::new, 129, UNKNOWN_VERSION_ADDED),
         NO_SHARD_AVAILABLE_ACTION_EXCEPTION(org.elasticsearch.action.NoShardAvailableActionException.class,
-                org.elasticsearch.action.NoShardAvailableActionException::new, 130),
+                org.elasticsearch.action.NoShardAvailableActionException::new, 130, UNKNOWN_VERSION_ADDED),
         UNAVAILABLE_SHARDS_EXCEPTION(org.elasticsearch.action.UnavailableShardsException.class,
-                org.elasticsearch.action.UnavailableShardsException::new, 131),
+                org.elasticsearch.action.UnavailableShardsException::new, 131, UNKNOWN_VERSION_ADDED),
         FLUSH_FAILED_ENGINE_EXCEPTION(org.elasticsearch.index.engine.FlushFailedEngineException.class,
-                org.elasticsearch.index.engine.FlushFailedEngineException::new, 132),
+                org.elasticsearch.index.engine.FlushFailedEngineException::new, 132, UNKNOWN_VERSION_ADDED),
         CIRCUIT_BREAKING_EXCEPTION(org.elasticsearch.common.breaker.CircuitBreakingException.class,
-                org.elasticsearch.common.breaker.CircuitBreakingException::new, 133),
+                org.elasticsearch.common.breaker.CircuitBreakingException::new, 133, UNKNOWN_VERSION_ADDED),
         NODE_NOT_CONNECTED_EXCEPTION(org.elasticsearch.transport.NodeNotConnectedException.class,
-                org.elasticsearch.transport.NodeNotConnectedException::new, 134),
+                org.elasticsearch.transport.NodeNotConnectedException::new, 134, UNKNOWN_VERSION_ADDED),
         STRICT_DYNAMIC_MAPPING_EXCEPTION(org.elasticsearch.index.mapper.StrictDynamicMappingException.class,
-                org.elasticsearch.index.mapper.StrictDynamicMappingException::new, 135),
+                org.elasticsearch.index.mapper.StrictDynamicMappingException::new, 135, UNKNOWN_VERSION_ADDED),
         RETRY_ON_REPLICA_EXCEPTION(org.elasticsearch.action.support.replication.TransportReplicationAction.RetryOnReplicaException.class,
-                org.elasticsearch.action.support.replication.TransportReplicationAction.RetryOnReplicaException::new, 136),
+                org.elasticsearch.action.support.replication.TransportReplicationAction.RetryOnReplicaException::new, 136,
+            UNKNOWN_VERSION_ADDED),
         TYPE_MISSING_EXCEPTION(org.elasticsearch.indices.TypeMissingException.class,
-                org.elasticsearch.indices.TypeMissingException::new, 137),
+                org.elasticsearch.indices.TypeMissingException::new, 137, UNKNOWN_VERSION_ADDED),
         FAILED_TO_COMMIT_CLUSTER_STATE_EXCEPTION(org.elasticsearch.discovery.Discovery.FailedToCommitClusterStateException.class,
-                org.elasticsearch.discovery.Discovery.FailedToCommitClusterStateException::new, 140),
+                org.elasticsearch.discovery.Discovery.FailedToCommitClusterStateException::new, 140, UNKNOWN_VERSION_ADDED),
         QUERY_SHARD_EXCEPTION(org.elasticsearch.index.query.QueryShardException.class,
-                org.elasticsearch.index.query.QueryShardException::new, 141),
+                org.elasticsearch.index.query.QueryShardException::new, 141, UNKNOWN_VERSION_ADDED),
         NO_LONGER_PRIMARY_SHARD_EXCEPTION(ShardStateAction.NoLongerPrimaryShardException.class,
-                ShardStateAction.NoLongerPrimaryShardException::new, 142),
-        SCRIPT_EXCEPTION(org.elasticsearch.script.ScriptException.class, org.elasticsearch.script.ScriptException::new, 143),
-        NOT_MASTER_EXCEPTION(org.elasticsearch.cluster.NotMasterException.class, org.elasticsearch.cluster.NotMasterException::new, 144),
-        STATUS_EXCEPTION(org.elasticsearch.ElasticsearchStatusException.class, org.elasticsearch.ElasticsearchStatusException::new, 145),
+                ShardStateAction.NoLongerPrimaryShardException::new, 142, UNKNOWN_VERSION_ADDED),
+        SCRIPT_EXCEPTION(org.elasticsearch.script.ScriptException.class, org.elasticsearch.script.ScriptException::new, 143,
+            UNKNOWN_VERSION_ADDED),
+        NOT_MASTER_EXCEPTION(org.elasticsearch.cluster.NotMasterException.class, org.elasticsearch.cluster.NotMasterException::new, 144,
+            UNKNOWN_VERSION_ADDED),
+        STATUS_EXCEPTION(org.elasticsearch.ElasticsearchStatusException.class, org.elasticsearch.ElasticsearchStatusException::new, 145,
+            UNKNOWN_VERSION_ADDED),
         TASK_CANCELLED_EXCEPTION(org.elasticsearch.tasks.TaskCancelledException.class,
-            org.elasticsearch.tasks.TaskCancelledException::new, 146);
+            org.elasticsearch.tasks.TaskCancelledException::new, 146, UNKNOWN_VERSION_ADDED),
+        SHARD_LOCK_OBTAIN_FAILED_EXCEPTION(org.elasticsearch.env.ShardLockObtainFailedException.class,
+                                           org.elasticsearch.env.ShardLockObtainFailedException::new, 147, V_5_1_0_UNRELEASED);
 
 
         final Class<? extends ElasticsearchException> exceptionClass;
         final FunctionThatThrowsIOException<StreamInput, ? extends ElasticsearchException> constructor;
         final int id;
+        final Version versionAdded;
 
         <E extends ElasticsearchException> ElasticsearchExceptionHandle(Class<E> exceptionClass,
-                FunctionThatThrowsIOException<StreamInput, E> constructor, int id) {
+                                                                        FunctionThatThrowsIOException<StreamInput, E> constructor, int id,
+                                                                        Version versionAdded) {
             // We need the exceptionClass because you can't dig it out of the constructor reliably.
             this.exceptionClass = exceptionClass;
             this.constructor = constructor;
+            this.versionAdded = versionAdded;
             this.id = id;
         }
     }
diff --git a/core/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java b/core/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java
index 1b818d86eac..53ca5fb84b3 100644
--- a/core/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java
+++ b/core/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java
@@ -33,8 +33,6 @@ import org.elasticsearch.common.settings.Setting;
 import org.elasticsearch.common.settings.Setting.Property;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.BigArrays;
-import org.elasticsearch.index.IndexNotFoundException;
-import org.elasticsearch.indices.IndexClosedException;
 import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.search.SearchService;
 import org.elasticsearch.search.internal.AliasFilter;
@@ -108,26 +106,20 @@ public class TransportSearchAction extends HandledTransportAction<SearchRequest,
         failIfOverShardCountLimit(clusterService, shardIterators.size());
 
         // optimize search type for cases where there is only one shard group to search on
-        try {
-            if (shardIterators.size() == 1) {
-                // if we only have one group, then we always want Q_A_F, no need for DFS, and no need to do THEN since we hit one shard
-                searchRequest.searchType(QUERY_AND_FETCH);
+        if (shardIterators.size() == 1) {
+            // if we only have one group, then we always want Q_A_F, no need for DFS, and no need to do THEN since we hit one shard
+            searchRequest.searchType(QUERY_AND_FETCH);
+        }
+        if (searchRequest.isSuggestOnly()) {
+            // disable request cache if we have only suggest
+            searchRequest.requestCache(false);
+            switch (searchRequest.searchType()) {
+                case DFS_QUERY_AND_FETCH:
+                case DFS_QUERY_THEN_FETCH:
+                    // convert to Q_T_F if we have only suggest
+                    searchRequest.searchType(QUERY_THEN_FETCH);
+                    break;
             }
-            if (searchRequest.isSuggestOnly()) {
-                // disable request cache if we have only suggest
-                searchRequest.requestCache(false);
-                switch (searchRequest.searchType()) {
-                    case DFS_QUERY_AND_FETCH:
-                    case DFS_QUERY_THEN_FETCH:
-                        // convert to Q_T_F if we have only suggest
-                        searchRequest.searchType(QUERY_THEN_FETCH);
-                        break;
-                }
-            }
-        } catch (IndexNotFoundException | IndexClosedException e) {
-            // ignore these failures, we will notify the search response if its really the case from the actual action
-        } catch (Exception e) {
-            logger.debug("failed to optimize search type, continue as normal", e);
         }
 
         searchAsyncAction((SearchTask)task, searchRequest, shardIterators, startTimeInMillis, clusterState,
diff --git a/core/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java b/core/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java
index 024672922fa..0f0a9ae2c5d 100644
--- a/core/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java
+++ b/core/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java
@@ -1018,7 +1018,8 @@ public abstract class TransportReplicationAction<
             }
             transportService.sendRequest(node, transportReplicaAction,
                 new ConcreteShardRequest<>(request, replica.allocationId().getId()), transportOptions,
-                new ActionListenerResponseHandler<>(listener, ReplicaResponse::new));
+                // Eclipse can't handle when this is <> so we specify the type here.
+                new ActionListenerResponseHandler<ReplicaResponse>(listener, ReplicaResponse::new));
         }
 
         @Override
diff --git a/core/src/main/java/org/elasticsearch/bootstrap/Elasticsearch.java b/core/src/main/java/org/elasticsearch/bootstrap/Elasticsearch.java
index b4ec024b9e8..23a24d88f64 100644
--- a/core/src/main/java/org/elasticsearch/bootstrap/Elasticsearch.java
+++ b/core/src/main/java/org/elasticsearch/bootstrap/Elasticsearch.java
@@ -33,6 +33,7 @@ import org.elasticsearch.node.NodeValidationException;
 
 import java.io.IOException;
 import java.nio.file.Path;
+import java.security.Permission;
 import java.util.Arrays;
 import java.util.Map;
 
@@ -69,6 +70,14 @@ class Elasticsearch extends SettingCommand {
      * Main entry point for starting elasticsearch
      */
     public static void main(final String[] args) throws Exception {
+        // we want the JVM to think there is a security manager installed so that if internal policy decisions that would be based on the
+        // presence of a security manager or lack thereof act as if there is a security manager present (e.g., DNS cache policy)
+        System.setSecurityManager(new SecurityManager() {
+            @Override
+            public void checkPermission(Permission perm) {
+                // grant all permissions so that we can later set the security manager to the one that we want
+            }
+        });
         final Elasticsearch elasticsearch = new Elasticsearch();
         int status = main(args, elasticsearch, Terminal.DEFAULT);
         if (status != ExitCodes.OK) {
diff --git a/core/src/main/java/org/elasticsearch/bootstrap/Security.java b/core/src/main/java/org/elasticsearch/bootstrap/Security.java
index 2b8fd325d81..8cf67d70e4d 100644
--- a/core/src/main/java/org/elasticsearch/bootstrap/Security.java
+++ b/core/src/main/java/org/elasticsearch/bootstrap/Security.java
@@ -78,7 +78,7 @@ import java.util.Map;
  * when they are so dangerous that general code should not be granted the
  * permission, but there are extenuating circumstances.
  * <p>
- * Scripts (groovy, javascript, python) are assigned minimal permissions. This does not provide adequate
+ * Scripts (groovy) are assigned minimal permissions. This does not provide adequate
  * sandboxing, as these scripts still have access to ES classes, and could
  * modify members, etc that would cause bad things to happen later on their
  * behalf (no package protections are yet in place, this would need some
diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterChangedEvent.java b/core/src/main/java/org/elasticsearch/cluster/ClusterChangedEvent.java
index e3164eacdbb..701656db9ce 100644
--- a/core/src/main/java/org/elasticsearch/cluster/ClusterChangedEvent.java
+++ b/core/src/main/java/org/elasticsearch/cluster/ClusterChangedEvent.java
@@ -20,17 +20,21 @@
 package org.elasticsearch.cluster;
 
 import com.carrotsearch.hppc.cursors.ObjectCursor;
+import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.cluster.metadata.IndexGraveyard;
 import org.elasticsearch.cluster.metadata.MetaData;
 import org.elasticsearch.cluster.node.DiscoveryNodes;
+import org.elasticsearch.common.collect.ImmutableOpenMap;
 import org.elasticsearch.gateway.GatewayService;
 import org.elasticsearch.index.Index;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -143,6 +147,33 @@ public class ClusterChangedEvent {
         return state.metaData() != previousState.metaData();
     }
 
+    /**
+     * Returns a set of custom meta data types when any custom metadata for the cluster has changed
+     * between the previous cluster state and the new cluster state. custom meta data types are
+     * returned iff they have been added, updated or removed between the previous and the current state
+     */
+    public Set<String> changedCustomMetaDataSet() {
+        Set<String> result = new HashSet<>();
+        ImmutableOpenMap<String, MetaData.Custom> currentCustoms = state.metaData().customs();
+        ImmutableOpenMap<String, MetaData.Custom> previousCustoms = previousState.metaData().customs();
+        if (currentCustoms.equals(previousCustoms) == false) {
+            for (ObjectObjectCursor<String, MetaData.Custom> currentCustomMetaData : currentCustoms) {
+                // new custom md added or existing custom md changed
+                if (previousCustoms.containsKey(currentCustomMetaData.key) == false
+                        || currentCustomMetaData.value.equals(previousCustoms.get(currentCustomMetaData.key)) == false) {
+                    result.add(currentCustomMetaData.key);
+                }
+            }
+            // existing custom md deleted
+            for (ObjectObjectCursor<String, MetaData.Custom> previousCustomMetaData : previousCustoms) {
+                if (currentCustoms.containsKey(previousCustomMetaData.key) == false) {
+                    result.add(previousCustomMetaData.key);
+                }
+            }
+        }
+        return result;
+    }
+
     /**
      * Returns <code>true</code> iff the {@link IndexMetaData} for a given index
      * has changed between the previous cluster state and the new cluster state.
diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterState.java b/core/src/main/java/org/elasticsearch/cluster/ClusterState.java
index 7699e6fff87..c842c57daec 100644
--- a/core/src/main/java/org/elasticsearch/cluster/ClusterState.java
+++ b/core/src/main/java/org/elasticsearch/cluster/ClusterState.java
@@ -108,13 +108,7 @@ public class ClusterState implements ToXContent, Diffable<ClusterState> {
         registerPrototype(RestoreInProgress.TYPE, RestoreInProgress.PROTO);
     }
 
-    @Nullable
     public static <T extends Custom> T lookupPrototype(String type) {
-        //noinspection unchecked
-        return (T) customPrototypes.get(type);
-    }
-
-    public static <T extends Custom> T lookupPrototypeSafe(String type) {
         @SuppressWarnings("unchecked")
         T proto = (T) customPrototypes.get(type);
         if (proto == null) {
@@ -308,7 +302,7 @@ public class ClusterState implements ToXContent, Diffable<ClusterState> {
 
         private final String value;
 
-        private Metric(String value) {
+        Metric(String value) {
             this.value = value;
         }
 
@@ -630,10 +624,6 @@ public class ClusterState implements ToXContent, Diffable<ClusterState> {
             return this;
         }
 
-        public Custom getCustom(String type) {
-            return customs.get(type);
-        }
-
         public Builder putCustom(String type, Custom custom) {
             customs.put(type, custom);
             return this;
@@ -707,7 +697,7 @@ public class ClusterState implements ToXContent, Diffable<ClusterState> {
         int customSize = in.readVInt();
         for (int i = 0; i < customSize; i++) {
             String type = in.readString();
-            Custom customIndexMetaData = lookupPrototypeSafe(type).readFrom(in);
+            Custom customIndexMetaData = lookupPrototype(type).readFrom(in);
             builder.putCustom(type, customIndexMetaData);
         }
         return builder.build();
@@ -779,12 +769,12 @@ public class ClusterState implements ToXContent, Diffable<ClusterState> {
                 new DiffableUtils.DiffableValueSerializer<String, Custom>() {
                     @Override
                     public Custom read(StreamInput in, String key) throws IOException {
-                        return lookupPrototypeSafe(key).readFrom(in);
+                        return lookupPrototype(key).readFrom(in);
                     }
 
                     @Override
                     public Diff<Custom> readDiff(StreamInput in, String key) throws IOException {
-                        return lookupPrototypeSafe(key).readDiffFrom(in);
+                        return lookupPrototype(key).readDiffFrom(in);
                     }
                 });
         }
diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java
index 0471ef1c09b..c19dcdd0ecb 100644
--- a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java
+++ b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java
@@ -474,12 +474,7 @@ public class MetaDataCreateIndexService extends AbstractComponent {
             }
         }
 
-        CollectionUtil.timSort(templateMetadata, new Comparator<IndexTemplateMetaData>() {
-            @Override
-            public int compare(IndexTemplateMetaData o1, IndexTemplateMetaData o2) {
-                return o2.order() - o1.order();
-            }
-        });
+        CollectionUtil.timSort(templateMetadata, Comparator.comparingInt(IndexTemplateMetaData::order).reversed());
         return templateMetadata;
     }
 
diff --git a/core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java b/core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java
index 895195d35b3..e557b52c1d4 100644
--- a/core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java
+++ b/core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java
@@ -38,7 +38,6 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * This class holds all {@link DiscoveryNode} in the cluster and provides convenience methods to
@@ -56,19 +55,17 @@ public class DiscoveryNodes extends AbstractDiffable<DiscoveryNodes> implements
 
     private final String masterNodeId;
     private final String localNodeId;
-    private final Version minNodeVersion;
     private final Version minNonClientNodeVersion;
 
     private DiscoveryNodes(ImmutableOpenMap<String, DiscoveryNode> nodes, ImmutableOpenMap<String, DiscoveryNode> dataNodes,
                            ImmutableOpenMap<String, DiscoveryNode> masterNodes, ImmutableOpenMap<String, DiscoveryNode> ingestNodes,
-                           String masterNodeId, String localNodeId, Version minNodeVersion, Version minNonClientNodeVersion) {
+                           String masterNodeId, String localNodeId, Version minNonClientNodeVersion) {
         this.nodes = nodes;
         this.dataNodes = dataNodes;
         this.masterNodes = masterNodes;
         this.ingestNodes = ingestNodes;
         this.masterNodeId = masterNodeId;
         this.localNodeId = localNodeId;
-        this.minNodeVersion = minNodeVersion;
         this.minNonClientNodeVersion = minNonClientNodeVersion;
     }
 
@@ -173,7 +170,6 @@ public class DiscoveryNodes extends AbstractDiffable<DiscoveryNodes> implements
         return existing != null && existing.equals(node);
     }
 
-
     /**
      * Get the id of the master node
      *
@@ -230,16 +226,6 @@ public class DiscoveryNodes extends AbstractDiffable<DiscoveryNodes> implements
         return nodesIds == null || nodesIds.length == 0 || (nodesIds.length == 1 && nodesIds[0].equals("_all"));
     }
 
-
-    /**
-     * Returns the version of the node with the oldest version in the cluster
-     *
-     * @return the oldest version in the cluster
-     */
-    public Version getSmallestVersion() {
-        return minNodeVersion;
-    }
-
     /**
      * Returns the version of the node with the oldest version in the cluster that is not a client node
      *
@@ -353,16 +339,6 @@ public class DiscoveryNodes extends AbstractDiffable<DiscoveryNodes> implements
         }
     }
 
-    public DiscoveryNodes removeDeadMembers(Set<String> newNodes, String masterNodeId) {
-        Builder builder = new Builder().masterNodeId(masterNodeId).localNodeId(localNodeId);
-        for (DiscoveryNode node : this) {
-            if (newNodes.contains(node.getId())) {
-                builder.add(node);
-            }
-        }
-        return builder.build();
-    }
-
     public DiscoveryNodes newNode(DiscoveryNode node) {
         return new Builder(this).add(node).build();
     }
@@ -420,11 +396,7 @@ public class DiscoveryNodes extends AbstractDiffable<DiscoveryNodes> implements
         private final List<DiscoveryNode> removed;
         private final List<DiscoveryNode> added;
 
-        public Delta(String localNodeId, List<DiscoveryNode> removed, List<DiscoveryNode> added) {
-            this(null, null, localNodeId, removed, added);
-        }
-
-        public Delta(@Nullable DiscoveryNode previousMasterNode, @Nullable DiscoveryNode newMasterNode, String localNodeId,
+        private Delta(@Nullable DiscoveryNode previousMasterNode, @Nullable DiscoveryNode newMasterNode, String localNodeId,
                      List<DiscoveryNode> removed, List<DiscoveryNode> added) {
             this.previousMasterNode = previousMasterNode;
             this.newMasterNode = newMasterNode;
@@ -677,7 +649,7 @@ public class DiscoveryNodes extends AbstractDiffable<DiscoveryNodes> implements
 
             return new DiscoveryNodes(
                 nodes.build(), dataNodesBuilder.build(), masterNodesBuilder.build(), ingestNodesBuilder.build(),
-                masterNodeId, localNodeId, minNodeVersion, minNonClientNodeVersion
+                masterNodeId, localNodeId, minNonClientNodeVersion
             );
         }
 
diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/ShardAllocationDecision.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecision.java
similarity index 61%
rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/ShardAllocationDecision.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecision.java
index 74fd7668a01..5a82d0dfa90 100644
--- a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/ShardAllocationDecision.java
+++ b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecision.java
@@ -30,29 +30,29 @@ import java.util.Map;
 import java.util.Objects;
 
 /**
- * Represents the allocation decision by an allocator for a shard.
+ * Represents the allocation decision by an allocator for an unassigned shard.
  */
-public class ShardAllocationDecision {
+public class AllocateUnassignedDecision {
     /** a constant representing a shard decision where no decision was taken */
-    public static final ShardAllocationDecision DECISION_NOT_TAKEN =
-        new ShardAllocationDecision(null, null, null, null, null, null, null);
+    public static final AllocateUnassignedDecision NOT_TAKEN =
+        new AllocateUnassignedDecision(null, null, null, null, null, null, null);
     /**
      * a map of cached common no/throttle decisions that don't need explanations,
      * this helps prevent unnecessary object allocations for the non-explain API case
      */
-    private static final Map<AllocationStatus, ShardAllocationDecision> CACHED_DECISIONS;
+    private static final Map<AllocationStatus, AllocateUnassignedDecision> CACHED_DECISIONS;
     static {
-        Map<AllocationStatus, ShardAllocationDecision> cachedDecisions = new HashMap<>();
+        Map<AllocationStatus, AllocateUnassignedDecision> cachedDecisions = new HashMap<>();
         cachedDecisions.put(AllocationStatus.FETCHING_SHARD_DATA,
-            new ShardAllocationDecision(Type.NO, AllocationStatus.FETCHING_SHARD_DATA, null, null, null, null, null));
+            new AllocateUnassignedDecision(Type.NO, AllocationStatus.FETCHING_SHARD_DATA, null, null, null, null, null));
         cachedDecisions.put(AllocationStatus.NO_VALID_SHARD_COPY,
-            new ShardAllocationDecision(Type.NO, AllocationStatus.NO_VALID_SHARD_COPY, null, null, null, null, null));
+            new AllocateUnassignedDecision(Type.NO, AllocationStatus.NO_VALID_SHARD_COPY, null, null, null, null, null));
         cachedDecisions.put(AllocationStatus.DECIDERS_NO,
-            new ShardAllocationDecision(Type.NO, AllocationStatus.DECIDERS_NO, null, null, null, null, null));
+            new AllocateUnassignedDecision(Type.NO, AllocationStatus.DECIDERS_NO, null, null, null, null, null));
         cachedDecisions.put(AllocationStatus.DECIDERS_THROTTLED,
-            new ShardAllocationDecision(Type.THROTTLE, AllocationStatus.DECIDERS_THROTTLED, null, null, null, null, null));
+            new AllocateUnassignedDecision(Type.THROTTLE, AllocationStatus.DECIDERS_THROTTLED, null, null, null, null, null));
         cachedDecisions.put(AllocationStatus.DELAYED_ALLOCATION,
-            new ShardAllocationDecision(Type.NO, AllocationStatus.DELAYED_ALLOCATION, null, null, null, null, null));
+            new AllocateUnassignedDecision(Type.NO, AllocationStatus.DELAYED_ALLOCATION, null, null, null, null, null));
         CACHED_DECISIONS = Collections.unmodifiableMap(cachedDecisions);
     }
 
@@ -67,17 +67,17 @@ public class ShardAllocationDecision {
     @Nullable
     private final String allocationId;
     @Nullable
-    private final Map<String, WeightedDecision> nodeDecisions;
+    private final Map<String, NodeAllocationResult> nodeDecisions;
     @Nullable
     private final Decision shardDecision;
 
-    private ShardAllocationDecision(Type finalDecision,
-                                    AllocationStatus allocationStatus,
-                                    String finalExplanation,
-                                    String assignedNodeId,
-                                    String allocationId,
-                                    Map<String, WeightedDecision> nodeDecisions,
-                                    Decision shardDecision) {
+    private AllocateUnassignedDecision(Type finalDecision,
+                                       AllocationStatus allocationStatus,
+                                       String finalExplanation,
+                                       String assignedNodeId,
+                                       String allocationId,
+                                       Map<String, NodeAllocationResult> nodeDecisions,
+                                       Decision shardDecision) {
         assert assignedNodeId != null || finalDecision == null || finalDecision != Type.YES :
             "a yes decision must have a node to assign the shard to";
         assert allocationStatus != null || finalDecision == null || finalDecision == Type.YES :
@@ -96,9 +96,9 @@ public class ShardAllocationDecision {
     /**
      * Returns a NO decision with the given shard-level decision and explanation (if in explain mode).
      */
-    public static ShardAllocationDecision no(Decision shardDecision, @Nullable String explanation) {
+    public static AllocateUnassignedDecision no(Decision shardDecision, @Nullable String explanation) {
         if (explanation != null) {
-            return new ShardAllocationDecision(Type.NO, AllocationStatus.DECIDERS_NO, explanation, null, null, null, shardDecision);
+            return new AllocateUnassignedDecision(Type.NO, AllocationStatus.DECIDERS_NO, explanation, null, null, null, shardDecision);
         } else {
             return getCachedDecision(AllocationStatus.DECIDERS_NO);
         }
@@ -107,7 +107,7 @@ public class ShardAllocationDecision {
     /**
      * Returns a NO decision with the given {@link AllocationStatus} and explanation for the NO decision, if in explain mode.
      */
-    public static ShardAllocationDecision no(AllocationStatus allocationStatus, @Nullable String explanation) {
+    public static AllocateUnassignedDecision no(AllocationStatus allocationStatus, @Nullable String explanation) {
         return no(allocationStatus, explanation, null);
     }
 
@@ -115,11 +115,11 @@ public class ShardAllocationDecision {
      * Returns a NO decision with the given {@link AllocationStatus}, and the explanation for the NO decision
      * as well as the individual node-level decisions that comprised the final NO decision if in explain mode.
      */
-    public static ShardAllocationDecision no(AllocationStatus allocationStatus, @Nullable String explanation,
-                                             @Nullable Map<String, Decision> nodeDecisions) {
+    public static AllocateUnassignedDecision no(AllocationStatus allocationStatus, @Nullable String explanation,
+                                                @Nullable Map<String, Decision> nodeDecisions) {
         Objects.requireNonNull(allocationStatus, "allocationStatus must not be null");
         if (explanation != null) {
-            return new ShardAllocationDecision(Type.NO, allocationStatus, explanation, null, null, asExplanations(nodeDecisions), null);
+            return new AllocateUnassignedDecision(Type.NO, allocationStatus, explanation, null, null, asExplanations(nodeDecisions), null);
         } else {
             return getCachedDecision(allocationStatus);
         }
@@ -129,9 +129,9 @@ public class ShardAllocationDecision {
      * Returns a THROTTLE decision, with the given explanation and individual node-level decisions that
      * comprised the final THROTTLE decision if in explain mode.
      */
-    public static ShardAllocationDecision throttle(@Nullable String explanation, @Nullable Map<String, Decision> nodeDecisions) {
+    public static AllocateUnassignedDecision throttle(@Nullable String explanation, @Nullable Map<String, Decision> nodeDecisions) {
         if (explanation != null) {
-            return new ShardAllocationDecision(Type.THROTTLE, AllocationStatus.DECIDERS_THROTTLED, explanation, null, null,
+            return new AllocateUnassignedDecision(Type.THROTTLE, AllocationStatus.DECIDERS_THROTTLED, explanation, null, null,
                                                asExplanations(nodeDecisions), null);
         } else {
             return getCachedDecision(AllocationStatus.DECIDERS_THROTTLED);
@@ -143,17 +143,18 @@ public class ShardAllocationDecision {
      * comprised the final YES decision, along with the node id to which the shard is assigned and
      * the allocation id for the shard, if available.
      */
-    public static ShardAllocationDecision yes(String assignedNodeId, @Nullable String explanation, @Nullable String allocationId,
-                                              @Nullable Map<String, Decision> nodeDecisions) {
+    public static AllocateUnassignedDecision yes(String assignedNodeId, @Nullable String explanation, @Nullable String allocationId,
+                                                 @Nullable Map<String, Decision> nodeDecisions) {
         Objects.requireNonNull(assignedNodeId, "assignedNodeId must not be null");
-        return new ShardAllocationDecision(Type.YES, null, explanation, assignedNodeId, allocationId, asExplanations(nodeDecisions), null);
+        return new AllocateUnassignedDecision(Type.YES, null, explanation, assignedNodeId, allocationId,
+                                                 asExplanations(nodeDecisions), null);
     }
 
     /**
-     * Creates a {@link ShardAllocationDecision} from the given {@link Decision} and the assigned node, if any.
+     * Creates a {@link AllocateUnassignedDecision} from the given {@link Decision} and the assigned node, if any.
      */
-    public static ShardAllocationDecision fromDecision(Decision decision, @Nullable String assignedNodeId, boolean explain,
-                                                       @Nullable Map<String, WeightedDecision> nodeDecisions) {
+    public static AllocateUnassignedDecision fromDecision(Decision decision, @Nullable String assignedNodeId, boolean explain,
+                                                          @Nullable Map<String, NodeAllocationResult> nodeDecisions) {
         final Type decisionType = decision.type();
         AllocationStatus allocationStatus = decisionType != Type.YES ? AllocationStatus.fromDecision(decisionType) : null;
         String explanation = null;
@@ -168,19 +169,19 @@ public class ShardAllocationDecision {
                 explanation = "shard cannot be assigned to any node in the cluster";
             }
         }
-        return new ShardAllocationDecision(decisionType, allocationStatus, explanation, assignedNodeId, null, nodeDecisions, null);
+        return new AllocateUnassignedDecision(decisionType, allocationStatus, explanation, assignedNodeId, null, nodeDecisions, null);
     }
 
-    private static ShardAllocationDecision getCachedDecision(AllocationStatus allocationStatus) {
-        ShardAllocationDecision decision = CACHED_DECISIONS.get(allocationStatus);
+    private static AllocateUnassignedDecision getCachedDecision(AllocationStatus allocationStatus) {
+        AllocateUnassignedDecision decision = CACHED_DECISIONS.get(allocationStatus);
         return Objects.requireNonNull(decision, "precomputed decision not found for " + allocationStatus);
     }
 
-    private static Map<String, WeightedDecision> asExplanations(Map<String, Decision> decisionMap) {
+    private static Map<String, NodeAllocationResult> asExplanations(Map<String, Decision> decisionMap) {
         if (decisionMap != null) {
-            Map<String, WeightedDecision> explanationMap = new HashMap<>();
+            Map<String, NodeAllocationResult> explanationMap = new HashMap<>();
             for (Map.Entry<String, Decision> entry : decisionMap.entrySet()) {
-                explanationMap.put(entry.getKey(), new WeightedDecision(entry.getValue(), Float.POSITIVE_INFINITY));
+                explanationMap.put(entry.getKey(), new NodeAllocationResult(entry.getValue(), Float.POSITIVE_INFINITY));
             }
             return explanationMap;
         }
@@ -259,7 +260,7 @@ public class ShardAllocationDecision {
      * as the decision for the given node.
      */
     @Nullable
-    public Map<String, WeightedDecision> getNodeDecisions() {
+    public Map<String, NodeAllocationResult> getNodeDecisions() {
         return nodeDecisions;
     }
 
@@ -273,56 +274,4 @@ public class ShardAllocationDecision {
         return shardDecision;
     }
 
-    /**
-     * This class represents the shard allocation decision for a single node,
-     * including the {@link Decision} whether to allocate to the node and the
-     * weight assigned to the node for the shard in question.
-     */
-    public static final class WeightedDecision {
-
-        private final Decision decision;
-        private final float weight;
-
-        public WeightedDecision(Decision decision) {
-            this.decision = Objects.requireNonNull(decision);
-            this.weight = Float.POSITIVE_INFINITY;
-        }
-
-        public WeightedDecision(Decision decision, float weight) {
-            this.decision = Objects.requireNonNull(decision);
-            this.weight = Objects.requireNonNull(weight);
-        }
-
-        /**
-         * The decision for allocating to the node.
-         */
-        public Decision getDecision() {
-            return decision;
-        }
-
-        /**
-         * The calculated weight for allocating a shard to the node.  A value of {@link Float#POSITIVE_INFINITY}
-         * means the weight was not calculated or factored into the decision.
-         */
-        public float getWeight() {
-            return weight;
-        }
-
-        @Override
-        public boolean equals(Object other) {
-            if (this == other) {
-                return true;
-            }
-            if (other == null || getClass() != other.getClass()) {
-                return false;
-            }
-            WeightedDecision that = (WeightedDecision) other;
-            return decision.equals(that.decision) && Float.compare(weight, that.weight) == 0;
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(decision, weight);
-        }
-    }
 }
diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/MoveDecision.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/MoveDecision.java
new file mode 100644
index 00000000000..77e5bacf390
--- /dev/null
+++ b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/MoveDecision.java
@@ -0,0 +1,127 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.cluster.routing.allocation;
+
+import org.elasticsearch.cluster.routing.allocation.decider.Decision;
+import org.elasticsearch.common.Nullable;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * Represents a decision to move a started shard because it is no longer allowed to remain on its current node.
+ */
+public final class MoveDecision extends RelocationDecision {
+    /** a constant representing no decision taken */
+    public static final MoveDecision NOT_TAKEN = new MoveDecision(null, null, null, null, null);
+    /** cached decisions so we don't have to recreate objects for common decisions when not in explain mode. */
+    private static final MoveDecision CACHED_STAY_DECISION = new MoveDecision(Decision.YES, Decision.Type.NO, null, null, null);
+    private static final MoveDecision CACHED_CANNOT_MOVE_DECISION = new MoveDecision(Decision.NO, Decision.Type.NO, null, null, null);
+
+    @Nullable
+    private final Decision canRemainDecision;
+    @Nullable
+    private final Map<String, NodeAllocationResult> nodeDecisions;
+
+    private MoveDecision(Decision canRemainDecision, Decision.Type finalDecision, String finalExplanation,
+                         String assignedNodeId, Map<String, NodeAllocationResult> nodeDecisions) {
+        super(finalDecision, finalExplanation, assignedNodeId);
+        this.canRemainDecision = canRemainDecision;
+        this.nodeDecisions = nodeDecisions != null ? Collections.unmodifiableMap(nodeDecisions) : null;
+    }
+
+    /**
+     * Creates a move decision for the shard being able to remain on its current node, so not moving.
+     */
+    public static MoveDecision stay(Decision canRemainDecision, boolean explain) {
+        assert canRemainDecision.type() != Decision.Type.NO;
+        if (explain) {
+            final String explanation;
+            if (explain) {
+                explanation = "shard is allowed to remain on its current node, so no reason to move";
+            } else {
+                explanation = null;
+            }
+            return new MoveDecision(Objects.requireNonNull(canRemainDecision), Decision.Type.NO, explanation, null, null);
+        } else {
+            return CACHED_STAY_DECISION;
+        }
+    }
+
+    /**
+     * Creates a move decision for the shard not being able to remain on its current node.
+     *
+     * @param canRemainDecision the decision for whether the shard is allowed to remain on its current node
+     * @param finalDecision the decision of whether to move the shard to another node
+     * @param explain true if in explain mode
+     * @param currentNodeId the current node id where the shard is assigned
+     * @param assignedNodeId the node id for where the shard can move to
+     * @param nodeDecisions the node-level decisions that comprised the final decision, non-null iff explain is true
+     * @return the {@link MoveDecision} for moving the shard to another node
+     */
+    public static MoveDecision decision(Decision canRemainDecision, Decision.Type finalDecision, boolean explain, String currentNodeId,
+                                        String assignedNodeId, Map<String, NodeAllocationResult> nodeDecisions) {
+        assert canRemainDecision != null;
+        assert canRemainDecision.type() != Decision.Type.YES : "create decision with MoveDecision#stay instead";
+        String finalExplanation = null;
+        if (explain) {
+            assert currentNodeId != null;
+            if (finalDecision == Decision.Type.YES) {
+                assert assignedNodeId != null;
+                finalExplanation = "shard cannot remain on node [" + currentNodeId + "], moving to node [" + assignedNodeId + "]";
+            } else if (finalDecision == Decision.Type.THROTTLE) {
+                finalExplanation = "shard cannot remain on node [" + currentNodeId + "], throttled on moving to another node";
+            } else {
+                finalExplanation = "shard cannot remain on node [" + currentNodeId + "], but cannot be assigned to any other node";
+            }
+        }
+        if (finalExplanation == null && finalDecision == Decision.Type.NO) {
+            // the final decision is NO (no node to move the shard to) and we are not in explain mode, return a cached version
+            return CACHED_CANNOT_MOVE_DECISION;
+        } else {
+            assert ((assignedNodeId == null) == (finalDecision != Decision.Type.YES));
+            return new MoveDecision(canRemainDecision, finalDecision, finalExplanation, assignedNodeId, nodeDecisions);
+        }
+    }
+
+    /**
+     * Returns {@code true} if the shard cannot remain on its current node and can be moved, returns {@code false} otherwise.
+     */
+    public boolean move() {
+        return cannotRemain() && getFinalDecisionType() == Decision.Type.YES;
+    }
+
+    /**
+     * Returns {@code true} if the shard cannot remain on its current node.
+     */
+    public boolean cannotRemain() {
+        return isDecisionTaken() && canRemainDecision.type() == Decision.Type.NO;
+    }
+
+    /**
+     * Gets the individual node-level decisions that went into making the final decision as represented by
+     * {@link #getFinalDecisionType()}.  The map that is returned has the node id as the key and a {@link NodeAllocationResult}.
+     */
+    @Nullable
+    public Map<String, NodeAllocationResult> getNodeDecisions() {
+        return nodeDecisions;
+    }
+}
diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/NodeAllocationResult.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/NodeAllocationResult.java
new file mode 100644
index 00000000000..3e753ee0866
--- /dev/null
+++ b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/NodeAllocationResult.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.cluster.routing.allocation;
+
+import org.elasticsearch.cluster.routing.allocation.decider.Decision;
+
+import java.util.Objects;
+
+/**
+ * This class represents the shard allocation decision for a single node,
+ * including the {@link Decision} whether to allocate to the node and other
+ * information related to obtaining the decision for the node.
+ */
+public final class NodeAllocationResult {
+
+    private final Decision decision;
+    private final float weight;
+
+    public NodeAllocationResult(Decision decision) {
+        this.decision = Objects.requireNonNull(decision);
+        this.weight = Float.POSITIVE_INFINITY;
+    }
+
+    public NodeAllocationResult(Decision decision, float weight) {
+        this.decision = Objects.requireNonNull(decision);
+        this.weight = Objects.requireNonNull(weight);
+    }
+
+    /**
+     * The decision for allocating to the node.
+     */
+    public Decision getDecision() {
+        return decision;
+    }
+
+    /**
+     * The calculated weight for allocating a shard to the node.  A value of {@link Float#POSITIVE_INFINITY}
+     * means the weight was not calculated or factored into the decision.
+     */
+    public float getWeight() {
+        return weight;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+        NodeAllocationResult that = (NodeAllocationResult) other;
+        return decision.equals(that.decision) && Float.compare(weight, that.weight) == 0;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(decision, weight);
+    }
+}
diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/NodeRebalanceResult.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/NodeRebalanceResult.java
new file mode 100644
index 00000000000..1cb5d70f046
--- /dev/null
+++ b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/NodeRebalanceResult.java
@@ -0,0 +1,88 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.cluster.routing.allocation;
+
+import org.elasticsearch.cluster.routing.allocation.decider.Decision;
+
+import java.util.Objects;
+
+/**
+ * A node-level explanation for the decision to rebalance a shard.
+ */
+public final class NodeRebalanceResult {
+    private final Decision.Type nodeDecisionType;
+    private final Decision canAllocate;
+    private final boolean betterWeightThanCurrent;
+    private final boolean deltaAboveThreshold;
+    private final float currentWeight;
+    private final float weightWithShardAdded;
+
+    public NodeRebalanceResult(Decision.Type nodeDecisionType, Decision canAllocate, boolean betterWeightThanCurrent,
+                               boolean deltaAboveThreshold, float currentWeight, float weightWithShardAdded) {
+        this.nodeDecisionType = Objects.requireNonNull(nodeDecisionType);
+        this.canAllocate = Objects.requireNonNull(canAllocate);
+        this.betterWeightThanCurrent = betterWeightThanCurrent;
+        this.deltaAboveThreshold = deltaAboveThreshold;
+        this.currentWeight = currentWeight;
+        this.weightWithShardAdded = weightWithShardAdded;
+    }
+
+    /**
+     * Returns the decision to rebalance to the node.
+     */
+    public Decision.Type getNodeDecisionType() {
+        return nodeDecisionType;
+    }
+
+    /**
+     * Returns whether the shard is allowed to be allocated to the node.
+     */
+    public Decision getCanAllocateDecision() {
+        return canAllocate;
+    }
+
+    /**
+     * Returns whether the weight of the node is better than the weight of the node where the shard currently resides.
+     */
+    public boolean isBetterWeightThanCurrent() {
+        return betterWeightThanCurrent;
+    }
+
+    /**
+     * Returns if the weight delta by assigning to this node was above the threshold to warrant a rebalance.
+     */
+    public boolean isDeltaAboveThreshold() {
+        return deltaAboveThreshold;
+    }
+
+    /**
+     * Returns the current weight of the node if the shard is not added to the node.
+     */
+    public float getCurrentWeight() {
+        return currentWeight;
+    }
+
+    /**
+     * Returns the weight of the node if the shard is added to the node.
+     */
+    public float getWeightWithShardAdded() {
+        return weightWithShardAdded;
+    }
+}
diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/RebalanceDecision.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/RebalanceDecision.java
new file mode 100644
index 00000000000..1987cbefa28
--- /dev/null
+++ b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/RebalanceDecision.java
@@ -0,0 +1,95 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.cluster.routing.allocation;
+
+import org.elasticsearch.cluster.routing.allocation.decider.Decision;
+import org.elasticsearch.cluster.routing.allocation.decider.Decision.Type;
+import org.elasticsearch.common.Nullable;
+
+import java.util.Collections;
+import java.util.Map;
+
+/**
+ * Represents a decision to move a started shard to form a more optimally balanced cluster.
+ */
+public final class RebalanceDecision extends RelocationDecision {
+    /** a constant representing no decision taken */
+    public static final RebalanceDecision NOT_TAKEN = new RebalanceDecision(null, null, null, null, null, Float.POSITIVE_INFINITY);
+
+    @Nullable
+    private final Decision canRebalanceDecision;
+    @Nullable
+    private final Map<String, NodeRebalanceResult> nodeDecisions;
+    private float currentWeight;
+
+    public RebalanceDecision(Decision canRebalanceDecision, Type finalDecision, String finalExplanation) {
+        this(canRebalanceDecision, finalDecision, finalExplanation, null, null, Float.POSITIVE_INFINITY);
+    }
+
+    public RebalanceDecision(Decision canRebalanceDecision, Type finalDecision, String finalExplanation,
+                             String assignedNodeId, Map<String, NodeRebalanceResult> nodeDecisions, float currentWeight) {
+        super(finalDecision, finalExplanation, assignedNodeId);
+        this.canRebalanceDecision = canRebalanceDecision;
+        this.nodeDecisions = nodeDecisions != null ? Collections.unmodifiableMap(nodeDecisions) : null;
+        this.currentWeight = currentWeight;
+    }
+
+    /**
+     * Creates a new {@link RebalanceDecision}, computing the explanation based on the decision parameters.
+     */
+    public static RebalanceDecision decision(Decision canRebalanceDecision, Type finalDecision, String assignedNodeId,
+                                             Map<String, NodeRebalanceResult> nodeDecisions, float currentWeight, float threshold) {
+        final String explanation = produceFinalExplanation(finalDecision, assignedNodeId, threshold);
+        return new RebalanceDecision(canRebalanceDecision, finalDecision, explanation, assignedNodeId, nodeDecisions, currentWeight);
+    }
+
+    /**
+     * Returns the decision for being allowed to rebalance the shard.
+     */
+    @Nullable
+    public Decision getCanRebalanceDecision() {
+        return canRebalanceDecision;
+    }
+
+    /**
+     * Gets the individual node-level decisions that went into making the final decision as represented by
+     * {@link #getFinalDecisionType()}.  The map that is returned has the node id as the key and a {@link NodeRebalanceResult}.
+     */
+    @Nullable
+    public Map<String, NodeRebalanceResult> getNodeDecisions() {
+        return nodeDecisions;
+    }
+
+    private static String produceFinalExplanation(final Type finalDecisionType, final String assignedNodeId, final float threshold) {
+        final String finalExplanation;
+        if (assignedNodeId != null) {
+            if (finalDecisionType == Type.THROTTLE) {
+                finalExplanation = "throttle moving shard to node [" + assignedNodeId + "], as it is " +
+                                       "currently busy with other shard relocations";
+            } else {
+                finalExplanation = "moving shard to node [" + assignedNodeId + "] to form a more balanced cluster";
+            }
+        } else {
+            finalExplanation = "cannot rebalance shard, no other node exists that would form a more balanced " +
+                                   "cluster within the defined threshold [" + threshold + "]";
+        }
+        return finalExplanation;
+    }
+}
diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/RelocationDecision.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/RelocationDecision.java
new file mode 100644
index 00000000000..8fa8fe9d092
--- /dev/null
+++ b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/RelocationDecision.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.cluster.routing.allocation;
+
+import org.elasticsearch.cluster.routing.allocation.decider.Decision;
+import org.elasticsearch.common.Nullable;
+
+/**
+ * Represents a decision to relocate a started shard from its current node.
+ */
+public abstract class RelocationDecision {
+    @Nullable
+    private final Decision.Type finalDecision;
+    @Nullable
+    private final String finalExplanation;
+    @Nullable
+    private final String assignedNodeId;
+
+    protected RelocationDecision(Decision.Type finalDecision, String finalExplanation, String assignedNodeId) {
+        this.finalDecision = finalDecision;
+        this.finalExplanation = finalExplanation;
+        this.assignedNodeId = assignedNodeId;
+    }
+
+    /**
+     * Returns {@code true} if a decision was taken by the allocator, {@code false} otherwise.
+     * If no decision was taken, then the rest of the fields in this object are meaningless and return {@code null}.
+     */
+    public boolean isDecisionTaken() {
+        return finalDecision != null;
+    }
+
+    /**
+     * Returns the final decision made by the allocator on whether to assign the shard, and
+     * {@code null} if no decision was taken.
+     */
+    public Decision.Type getFinalDecisionType() {
+        return finalDecision;
+    }
+
+    /**
+     * Returns the free-text explanation for the reason behind the decision taken in {@link #getFinalDecisionType()}.
+     */
+    @Nullable
+    public String getFinalExplanation() {
+        return finalExplanation;
+    }
+
+    /**
+     * Get the node id that the allocator will assign the shard to, unless {@link #getFinalDecisionType()} returns
+     * a value other than {@link Decision.Type#YES}, in which case this returns {@code null}.
+     */
+    @Nullable
+    public String getAssignedNodeId() {
+        return assignedNodeId;
+    }
+}
diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java
index 3a6c1c45f01..7601f15f5d2 100644
--- a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java
+++ b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java
@@ -30,14 +30,16 @@ import org.elasticsearch.cluster.routing.RoutingNodes;
 import org.elasticsearch.cluster.routing.ShardRouting;
 import org.elasticsearch.cluster.routing.ShardRoutingState;
 import org.elasticsearch.cluster.routing.UnassignedInfo;
+import org.elasticsearch.cluster.routing.allocation.AllocateUnassignedDecision;
+import org.elasticsearch.cluster.routing.allocation.MoveDecision;
+import org.elasticsearch.cluster.routing.allocation.NodeRebalanceResult;
+import org.elasticsearch.cluster.routing.allocation.RebalanceDecision;
 import org.elasticsearch.cluster.routing.allocation.RoutingAllocation;
-import org.elasticsearch.cluster.routing.allocation.ShardAllocationDecision;
-import org.elasticsearch.cluster.routing.allocation.ShardAllocationDecision.WeightedDecision;
+import org.elasticsearch.cluster.routing.allocation.NodeAllocationResult;
 import org.elasticsearch.cluster.routing.allocation.decider.AllocationDeciders;
 import org.elasticsearch.cluster.routing.allocation.decider.Decision;
 import org.elasticsearch.cluster.routing.allocation.decider.Decision.Type;
 import org.elasticsearch.cluster.routing.allocation.decider.DiskThresholdDecider;
-import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.collect.Tuple;
 import org.elasticsearch.common.component.AbstractComponent;
 import org.elasticsearch.common.inject.Inject;
@@ -54,7 +56,6 @@ import java.util.HashSet;
 import java.util.IdentityHashMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 
 import static org.elasticsearch.cluster.routing.ShardRoutingState.RELOCATING;
@@ -368,7 +369,7 @@ public class BalancedShardsAllocator extends AbstractComponent implements Shards
             final float currentWeight = sorter.weight(currentNode);
             final AllocationDeciders deciders = allocation.deciders();
             final String idxName = shard.getIndexName();
-            Map<String, NodeRebalanceDecision> nodeDecisions = new HashMap<>(modelNodes.length - 1);
+            Map<String, NodeRebalanceResult> nodeDecisions = new HashMap<>(modelNodes.length - 1);
             Type rebalanceDecisionType = Type.NO;
             String assignedNodeId = null;
             for (ModelNode node : modelNodes) {
@@ -412,7 +413,7 @@ public class BalancedShardsAllocator extends AbstractComponent implements Shards
                         assignedNodeId = node.getNodeId();
                     }
                 }
-                nodeDecisions.put(node.getNodeId(), new NodeRebalanceDecision(
+                nodeDecisions.put(node.getNodeId(), new NodeRebalanceResult(
                     rebalanceConditionsMet ? canAllocate.type() : Type.NO,
                     canAllocate,
                     betterWeightThanCurrent,
@@ -683,14 +684,14 @@ public class BalancedShardsAllocator extends AbstractComponent implements Shards
              */
             Type bestDecision = Type.NO;
             RoutingNode targetNode = null;
-            final Map<String, WeightedDecision> nodeExplanationMap = explain ? new HashMap<>() : null;
+            final Map<String, NodeAllocationResult> nodeExplanationMap = explain ? new HashMap<>() : null;
             for (ModelNode currentNode : sorter.modelNodes) {
                 if (currentNode != sourceNode) {
                     RoutingNode target = currentNode.getRoutingNode();
                     // don't use canRebalance as we want hard filtering rules to apply. See #17698
                     Decision allocationDecision = allocation.deciders().canAllocate(shardRouting, target, allocation);
                     if (explain) {
-                        nodeExplanationMap.put(currentNode.getNodeId(), new WeightedDecision(allocationDecision, sorter.weight(currentNode)));
+                        nodeExplanationMap.put(currentNode.getNodeId(), new NodeAllocationResult(allocationDecision, sorter.weight(currentNode)));
                     }
                     // TODO maybe we can respect throttling here too?
                     if (allocationDecision.type().higherThan(bestDecision)) {
@@ -791,7 +792,7 @@ public class BalancedShardsAllocator extends AbstractComponent implements Shards
             do {
                 for (int i = 0; i < primaryLength; i++) {
                     ShardRouting shard = primary[i];
-                    ShardAllocationDecision allocationDecision = decideAllocateUnassigned(shard, throttledNodes);
+                    AllocateUnassignedDecision allocationDecision = decideAllocateUnassigned(shard, throttledNodes);
                     final Type decisionType = allocationDecision.getFinalDecisionType();
                     final String assignedNodeId = allocationDecision.getAssignedNodeId();
                     final ModelNode minNode = assignedNodeId != null ? nodes.get(assignedNodeId) : null;
@@ -864,16 +865,16 @@ public class BalancedShardsAllocator extends AbstractComponent implements Shards
          * {@link ModelNode} representing the node that the shard should be assigned to.  If the decision returned
          * is of type {@link Type#NO}, then the assigned node will be null.
          */
-        private ShardAllocationDecision decideAllocateUnassigned(final ShardRouting shard, final Set<ModelNode> throttledNodes) {
+        private AllocateUnassignedDecision decideAllocateUnassigned(final ShardRouting shard, final Set<ModelNode> throttledNodes) {
             if (shard.assignedToNode()) {
                 // we only make decisions for unassigned shards here
-                return ShardAllocationDecision.DECISION_NOT_TAKEN;
+                return AllocateUnassignedDecision.NOT_TAKEN;
             }
 
             Decision shardLevelDecision = allocation.deciders().canAllocate(shard, allocation);
             if (shardLevelDecision.type() == Type.NO) {
                 // NO decision for allocating the shard, irrespective of any particular node, so exit early
-                return ShardAllocationDecision.no(shardLevelDecision, explain("cannot allocate shard in its current state"));
+                return AllocateUnassignedDecision.no(shardLevelDecision, explain("cannot allocate shard in its current state"));
             }
 
             /* find an node with minimal weight we can allocate on*/
@@ -884,11 +885,11 @@ public class BalancedShardsAllocator extends AbstractComponent implements Shards
             if (throttledNodes.size() >= nodes.size() && explain == false) {
                 // all nodes are throttled, so we know we won't be able to allocate this round,
                 // so if we are not in explain mode, short circuit
-                return ShardAllocationDecision.no(UnassignedInfo.AllocationStatus.DECIDERS_NO, null);
+                return AllocateUnassignedDecision.no(UnassignedInfo.AllocationStatus.DECIDERS_NO, null);
             }
             /* Don't iterate over an identity hashset here the
              * iteration order is different for each run and makes testing hard */
-            Map<String, WeightedDecision> nodeExplanationMap = explain ? new HashMap<>() : null;
+            Map<String, NodeAllocationResult> nodeExplanationMap = explain ? new HashMap<>() : null;
             for (ModelNode node : nodes.values()) {
                 if ((throttledNodes.contains(node) || node.containsShard(shard)) && explain == false) {
                     // decision is NO without needing to check anything further, so short circuit
@@ -904,7 +905,7 @@ public class BalancedShardsAllocator extends AbstractComponent implements Shards
 
                 Decision currentDecision = allocation.deciders().canAllocate(shard, node.getRoutingNode(), allocation);
                 if (explain) {
-                    nodeExplanationMap.put(node.getNodeId(), new WeightedDecision(currentDecision, currentWeight));
+                    nodeExplanationMap.put(node.getNodeId(), new NodeAllocationResult(currentDecision, currentWeight));
                 }
                 if (currentDecision.type() == Type.YES || currentDecision.type() == Type.THROTTLE) {
                     final boolean updateMinNode;
@@ -945,7 +946,7 @@ public class BalancedShardsAllocator extends AbstractComponent implements Shards
                 // decision was not set and a node was not assigned, so treat it as a NO decision
                 decision = Decision.NO;
             }
-            return ShardAllocationDecision.fromDecision(
+            return AllocateUnassignedDecision.fromDecision(
                 decision,
                 minNode != null ? minNode.getNodeId() : null,
                 explain,
@@ -1223,287 +1224,4 @@ public class BalancedShardsAllocator extends AbstractComponent implements Shards
         }
     }
 
-    /**
-     * Represents a decision to relocate a started shard from its current node.
-     */
-    public abstract static class RelocationDecision {
-        @Nullable
-        private final Type finalDecision;
-        @Nullable
-        private final String finalExplanation;
-        @Nullable
-        private final String assignedNodeId;
-
-        protected RelocationDecision(Type finalDecision, String finalExplanation, String assignedNodeId) {
-            this.finalDecision = finalDecision;
-            this.finalExplanation = finalExplanation;
-            this.assignedNodeId = assignedNodeId;
-        }
-
-        /**
-         * Returns {@code true} if a decision was taken by the allocator, {@code false} otherwise.
-         * If no decision was taken, then the rest of the fields in this object are meaningless and return {@code null}.
-         */
-        public boolean isDecisionTaken() {
-            return finalDecision != null;
-        }
-
-        /**
-         * Returns the final decision made by the allocator on whether to assign the shard, and
-         * {@code null} if no decision was taken.
-         */
-        public Type getFinalDecisionType() {
-            return finalDecision;
-        }
-
-        /**
-         * Returns the free-text explanation for the reason behind the decision taken in {@link #getFinalDecisionType()}.
-         */
-        @Nullable
-        public String getFinalExplanation() {
-            return finalExplanation;
-        }
-
-        /**
-         * Get the node id that the allocator will assign the shard to, unless {@link #getFinalDecisionType()} returns
-         * a value other than {@link Decision.Type#YES}, in which case this returns {@code null}.
-         */
-        @Nullable
-        public String getAssignedNodeId() {
-            return assignedNodeId;
-        }
-    }
-
-    /**
-     * Represents a decision to move a started shard because it is no longer allowed to remain on its current node.
-     */
-    public static final class MoveDecision extends RelocationDecision {
-        /** a constant representing no decision taken */
-        public static final MoveDecision NOT_TAKEN = new MoveDecision(null, null, null, null, null);
-        /** cached decisions so we don't have to recreate objects for common decisions when not in explain mode. */
-        private static final MoveDecision CACHED_STAY_DECISION = new MoveDecision(Decision.YES, Type.NO, null, null, null);
-        private static final MoveDecision CACHED_CANNOT_MOVE_DECISION = new MoveDecision(Decision.NO, Type.NO, null, null, null);
-
-        @Nullable
-        private final Decision canRemainDecision;
-        @Nullable
-        private final Map<String, WeightedDecision> nodeDecisions;
-
-        private MoveDecision(Decision canRemainDecision, Type finalDecision, String finalExplanation,
-                             String assignedNodeId, Map<String, WeightedDecision> nodeDecisions) {
-            super(finalDecision, finalExplanation, assignedNodeId);
-            this.canRemainDecision = canRemainDecision;
-            this.nodeDecisions = nodeDecisions != null ? Collections.unmodifiableMap(nodeDecisions) : null;
-        }
-
-        /**
-         * Creates a move decision for the shard being able to remain on its current node, so not moving.
-         */
-        public static MoveDecision stay(Decision canRemainDecision, boolean explain) {
-            assert canRemainDecision.type() != Type.NO;
-            if (explain) {
-                final String explanation;
-                if (explain) {
-                    explanation = "shard is allowed to remain on its current node, so no reason to move";
-                } else {
-                    explanation = null;
-                }
-                return new MoveDecision(Objects.requireNonNull(canRemainDecision), Type.NO, explanation, null, null);
-            } else {
-                return CACHED_STAY_DECISION;
-            }
-        }
-
-        /**
-         * Creates a move decision for the shard not being able to remain on its current node.
-         *
-         * @param canRemainDecision the decision for whether the shard is allowed to remain on its current node
-         * @param finalDecision the decision of whether to move the shard to another node
-         * @param explain true if in explain mode
-         * @param currentNodeId the current node id where the shard is assigned
-         * @param assignedNodeId the node id for where the shard can move to
-         * @param nodeDecisions the node-level decisions that comprised the final decision, non-null iff explain is true
-         * @return the {@link MoveDecision} for moving the shard to another node
-         */
-        public static MoveDecision decision(Decision canRemainDecision, Type finalDecision, boolean explain, String currentNodeId,
-                                            String assignedNodeId, Map<String, WeightedDecision> nodeDecisions) {
-            assert canRemainDecision != null;
-            assert canRemainDecision.type() != Type.YES : "create decision with MoveDecision#stay instead";
-            String finalExplanation = null;
-            if (explain) {
-                assert currentNodeId != null;
-                if (finalDecision == Type.YES) {
-                    assert assignedNodeId != null;
-                    finalExplanation = "shard cannot remain on node [" + currentNodeId + "], moving to node [" + assignedNodeId + "]";
-                } else if (finalDecision == Type.THROTTLE) {
-                    finalExplanation = "shard cannot remain on node [" + currentNodeId + "], throttled on moving to another node";
-                } else {
-                    finalExplanation = "shard cannot remain on node [" + currentNodeId + "], but cannot be assigned to any other node";
-                }
-            }
-            if (finalExplanation == null && finalDecision == Type.NO) {
-                // the final decision is NO (no node to move the shard to) and we are not in explain mode, return a cached version
-                return CACHED_CANNOT_MOVE_DECISION;
-            } else {
-                assert ((assignedNodeId == null) == (finalDecision != Type.YES));
-                return new MoveDecision(canRemainDecision, finalDecision, finalExplanation, assignedNodeId, nodeDecisions);
-            }
-        }
-
-        /**
-         * Returns {@code true} if the shard cannot remain on its current node and can be moved, returns {@code false} otherwise.
-         */
-        public boolean move() {
-            return cannotRemain() && getFinalDecisionType() == Type.YES;
-        }
-
-        /**
-         * Returns {@code true} if the shard cannot remain on its current node.
-         */
-        public boolean cannotRemain() {
-            return isDecisionTaken() && canRemainDecision.type() == Type.NO;
-        }
-
-        /**
-         * Gets the individual node-level decisions that went into making the final decision as represented by
-         * {@link #getFinalDecisionType()}.  The map that is returned has the node id as the key and a {@link WeightedDecision}.
-         */
-        @Nullable
-        public Map<String, WeightedDecision> getNodeDecisions() {
-            return nodeDecisions;
-        }
-    }
-
-    /**
-     * Represents a decision to move a started shard to form a more optimally balanced cluster.
-     */
-    public static final class RebalanceDecision extends RelocationDecision {
-        /** a constant representing no decision taken */
-        public static final RebalanceDecision NOT_TAKEN = new RebalanceDecision(null, null, null, null, null, Float.POSITIVE_INFINITY);
-
-        @Nullable
-        private final Decision canRebalanceDecision;
-        @Nullable
-        private final Map<String, NodeRebalanceDecision> nodeDecisions;
-        private float currentWeight;
-
-        protected RebalanceDecision(Decision canRebalanceDecision, Type finalDecision, String finalExplanation) {
-            this(canRebalanceDecision, finalDecision, finalExplanation, null, null, Float.POSITIVE_INFINITY);
-        }
-
-        protected RebalanceDecision(Decision canRebalanceDecision, Type finalDecision, String finalExplanation,
-                                    String assignedNodeId, Map<String, NodeRebalanceDecision> nodeDecisions, float currentWeight) {
-            super(finalDecision, finalExplanation, assignedNodeId);
-            this.canRebalanceDecision = canRebalanceDecision;
-            this.nodeDecisions = nodeDecisions != null ? Collections.unmodifiableMap(nodeDecisions) : null;
-            this.currentWeight = currentWeight;
-        }
-
-        /**
-         * Creates a new {@link RebalanceDecision}, computing the explanation based on the decision parameters.
-         */
-        public static RebalanceDecision decision(Decision canRebalanceDecision, Type finalDecision, String assignedNodeId,
-                                                 Map<String, NodeRebalanceDecision> nodeDecisions, float currentWeight, float threshold) {
-            final String explanation = produceFinalExplanation(finalDecision, assignedNodeId, threshold);
-            return new RebalanceDecision(canRebalanceDecision, finalDecision, explanation, assignedNodeId, nodeDecisions, currentWeight);
-        }
-
-        /**
-         * Returns the decision for being allowed to rebalance the shard.
-         */
-        @Nullable
-        public Decision getCanRebalanceDecision() {
-            return canRebalanceDecision;
-        }
-
-        /**
-         * Gets the individual node-level decisions that went into making the final decision as represented by
-         * {@link #getFinalDecisionType()}.  The map that is returned has the node id as the key and a {@link NodeRebalanceDecision}.
-         */
-        @Nullable
-        public Map<String, NodeRebalanceDecision> getNodeDecisions() {
-            return nodeDecisions;
-        }
-
-        private static String produceFinalExplanation(final Type finalDecisionType, final String assignedNodeId, final float threshold) {
-            final String finalExplanation;
-            if (assignedNodeId != null) {
-                if (finalDecisionType == Type.THROTTLE) {
-                    finalExplanation = "throttle moving shard to node [" + assignedNodeId + "], as it is " +
-                                           "currently busy with other shard relocations";
-                } else {
-                    finalExplanation = "moving shard to node [" + assignedNodeId + "] to form a more balanced cluster";
-                }
-            } else {
-                finalExplanation = "cannot rebalance shard, no other node exists that would form a more balanced " +
-                                       "cluster within the defined threshold [" + threshold + "]";
-            }
-            return finalExplanation;
-        }
-    }
-
-    /**
-     * A node-level explanation for the decision to rebalance a shard.
-     */
-    public static final class NodeRebalanceDecision {
-        private final Type nodeDecisionType;
-        private final Decision canAllocate;
-        private final boolean betterWeightThanCurrent;
-        private final boolean deltaAboveThreshold;
-        private final float currentWeight;
-        private final float weightWithShardAdded;
-
-        NodeRebalanceDecision(Type nodeDecisionType, Decision canAllocate, boolean betterWeightThanCurrent,
-                              boolean deltaAboveThreshold, float currentWeight, float weightWithShardAdded) {
-            this.nodeDecisionType = Objects.requireNonNull(nodeDecisionType);
-            this.canAllocate = Objects.requireNonNull(canAllocate);
-            this.betterWeightThanCurrent = betterWeightThanCurrent;
-            this.deltaAboveThreshold = deltaAboveThreshold;
-            this.currentWeight = currentWeight;
-            this.weightWithShardAdded = weightWithShardAdded;
-        }
-
-        /**
-         * Returns the decision to rebalance to the node.
-         */
-        public Type getNodeDecisionType() {
-            return nodeDecisionType;
-        }
-
-        /**
-         * Returns whether the shard is allowed to be allocated to the node.
-         */
-        public Decision getCanAllocateDecision() {
-            return canAllocate;
-        }
-
-        /**
-         * Returns whether the weight of the node is better than the weight of the node where the shard currently resides.
-         */
-        public boolean isBetterWeightThanCurrent() {
-            return betterWeightThanCurrent;
-        }
-
-        /**
-         * Returns if the weight delta by assigning to this node was above the threshold to warrant a rebalance.
-         */
-        public boolean isDeltaAboveThreshold() {
-            return deltaAboveThreshold;
-        }
-
-        /**
-         * Returns the current weight of the node if the shard is not added to the node.
-         */
-        public float getCurrentWeight() {
-            return currentWeight;
-        }
-
-        /**
-         * Returns the weight of the node if the shard is added to the node.
-         */
-        public float getWeightWithShardAdded() {
-            return weightWithShardAdded;
-        }
-    }
-
 }
diff --git a/core/src/main/java/org/elasticsearch/common/Numbers.java b/core/src/main/java/org/elasticsearch/common/Numbers.java
index 52d0337ef73..1735a0dfa65 100644
--- a/core/src/main/java/org/elasticsearch/common/Numbers.java
+++ b/core/src/main/java/org/elasticsearch/common/Numbers.java
@@ -21,6 +21,9 @@ package org.elasticsearch.common;
 
 import org.apache.lucene.util.BytesRef;
 
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
 /**
  * A set of utilities for numbers.
  */
@@ -178,4 +181,56 @@ public final class Numbers {
         }
         return true;
     }
+
+    /** Return the long that {@code n} stores, or throws an exception if the
+     *  stored value cannot be converted to a long that stores the exact same
+     *  value. */
+    public static long toLongExact(Number n) {
+        if (n instanceof Byte || n instanceof Short || n instanceof Integer
+                || n instanceof Long) {
+            return n.longValue();
+        } else if (n instanceof Float || n instanceof Double) {
+            double d = n.doubleValue();
+            if (d != Math.round(d)) {
+                throw new IllegalArgumentException(n + " is not an integer value");
+            }
+            return n.longValue();
+        } else if (n instanceof BigDecimal) {
+            return ((BigDecimal) n).toBigIntegerExact().longValueExact();
+        } else if (n instanceof BigInteger) {
+            return ((BigInteger) n).longValueExact();
+        } else {
+            throw new IllegalArgumentException("Cannot check whether [" + n + "] of class [" + n.getClass().getName()
+                    + "] is actually a long");
+        }
+    }
+
+    /** Return the int that {@code n} stores, or throws an exception if the
+     *  stored value cannot be converted to an int that stores the exact same
+     *  value. */
+    public static int toIntExact(Number n) {
+        return Math.toIntExact(toLongExact(n));
+    }
+
+    /** Return the short that {@code n} stores, or throws an exception if the
+     *  stored value cannot be converted to a short that stores the exact same
+     *  value. */
+    public static short toShortExact(Number n) {
+        long l = toLongExact(n);
+        if (l != (short) l) {
+            throw new ArithmeticException("short overflow: " + l);
+        }
+        return (short) l;
+    }
+
+    /** Return the byte that {@code n} stores, or throws an exception if the
+     *  stored value cannot be converted to a byte that stores the exact same
+     *  value. */
+    public static byte toByteExact(Number n) {
+        long l = toLongExact(n);
+        if (l != (byte) l) {
+            throw new ArithmeticException("byte overflow: " + l);
+        }
+        return (byte) l;
+    }
 }
diff --git a/core/src/main/java/org/elasticsearch/common/bytes/BytesReference.java b/core/src/main/java/org/elasticsearch/common/bytes/BytesReference.java
index f31ea2bbf82..92632ad7874 100644
--- a/core/src/main/java/org/elasticsearch/common/bytes/BytesReference.java
+++ b/core/src/main/java/org/elasticsearch/common/bytes/BytesReference.java
@@ -23,6 +23,7 @@ import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.BytesRefIterator;
 import org.elasticsearch.common.io.stream.StreamInput;
 
+import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -215,6 +216,7 @@ public abstract class BytesReference implements Accountable, Comparable<BytesRef
      * that way.
      */
     private static final class MarkSupportingStreamInputWrapper extends StreamInput {
+        // can't use FilterStreamInput it needs to reset the delegate
         private final BytesReference reference;
         private BytesReferenceStreamInput input;
         private int mark = 0;
@@ -254,6 +256,11 @@ public abstract class BytesReference implements Accountable, Comparable<BytesRef
             return input.available();
         }
 
+        @Override
+        protected void ensureCanReadBytes(int length) throws EOFException {
+            input.ensureCanReadBytes(length);
+        }
+
         @Override
         public void reset() throws IOException {
             input = new BytesReferenceStreamInput(reference.iterator(), reference.length());
diff --git a/core/src/main/java/org/elasticsearch/common/bytes/BytesReferenceStreamInput.java b/core/src/main/java/org/elasticsearch/common/bytes/BytesReferenceStreamInput.java
index 4426ea53efa..4dcd92bf549 100644
--- a/core/src/main/java/org/elasticsearch/common/bytes/BytesReferenceStreamInput.java
+++ b/core/src/main/java/org/elasticsearch/common/bytes/BytesReferenceStreamInput.java
@@ -114,6 +114,14 @@ final class BytesReferenceStreamInput extends StreamInput {
         return length - offset;
     }
 
+    @Override
+    protected void ensureCanReadBytes(int bytesToRead) throws EOFException {
+        int bytesAvailable = length - offset;
+        if (bytesAvailable < bytesToRead) {
+            throw new EOFException("tried to read: " + bytesToRead + " bytes but only " + bytesAvailable + " remaining");
+        }
+    }
+
     @Override
     public long skip(long n) throws IOException {
         final int skip = (int) Math.min(Integer.MAX_VALUE, n);
diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/ByteBufferStreamInput.java b/core/src/main/java/org/elasticsearch/common/io/stream/ByteBufferStreamInput.java
index 3193d47c47e..d0f39545856 100644
--- a/core/src/main/java/org/elasticsearch/common/io/stream/ByteBufferStreamInput.java
+++ b/core/src/main/java/org/elasticsearch/common/io/stream/ByteBufferStreamInput.java
@@ -86,6 +86,13 @@ public class ByteBufferStreamInput extends StreamInput {
         return buffer.remaining();
     }
 
+    @Override
+    protected void ensureCanReadBytes(int length) throws EOFException {
+        if (buffer.remaining() < length) {
+            throw new EOFException("tried to read: " + length + " bytes but only " + buffer.remaining() + " remaining");
+        }
+    }
+
     @Override
     public void mark(int readlimit) {
         buffer.mark();
diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/FilterStreamInput.java b/core/src/main/java/org/elasticsearch/common/io/stream/FilterStreamInput.java
index b8132b4e870..1a3f9fe601d 100644
--- a/core/src/main/java/org/elasticsearch/common/io/stream/FilterStreamInput.java
+++ b/core/src/main/java/org/elasticsearch/common/io/stream/FilterStreamInput.java
@@ -21,6 +21,7 @@ package org.elasticsearch.common.io.stream;
 
 import org.elasticsearch.Version;
 
+import java.io.EOFException;
 import java.io.IOException;
 
 /**
@@ -28,7 +29,7 @@ import java.io.IOException;
  */
 public abstract class FilterStreamInput extends StreamInput {
 
-    private final StreamInput delegate;
+    protected final StreamInput delegate;
 
     protected FilterStreamInput(StreamInput delegate) {
         this.delegate = delegate;
@@ -73,4 +74,9 @@ public abstract class FilterStreamInput extends StreamInput {
     public void setVersion(Version version) {
         delegate.setVersion(version);
     }
+
+    @Override
+    protected void ensureCanReadBytes(int length) throws EOFException {
+        delegate.ensureCanReadBytes(length);
+    }
 }
diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/InputStreamStreamInput.java b/core/src/main/java/org/elasticsearch/common/io/stream/InputStreamStreamInput.java
index a252b66bcfc..6d952b01a21 100644
--- a/core/src/main/java/org/elasticsearch/common/io/stream/InputStreamStreamInput.java
+++ b/core/src/main/java/org/elasticsearch/common/io/stream/InputStreamStreamInput.java
@@ -95,4 +95,9 @@ public class InputStreamStreamInput extends StreamInput {
     public long skip(long n) throws IOException {
         return is.skip(n);
     }
+
+    @Override
+    protected void ensureCanReadBytes(int length) throws EOFException {
+        // TODO what can we do here?
+    }
 }
diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java b/core/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java
index 794ed6f36fa..2e6e3dee41d 100644
--- a/core/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java
+++ b/core/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java
@@ -24,9 +24,10 @@ import org.apache.lucene.index.IndexFormatTooNewException;
 import org.apache.lucene.index.IndexFormatTooOldException;
 import org.apache.lucene.store.AlreadyClosedException;
 import org.apache.lucene.store.LockObtainFailedException;
+import org.apache.lucene.util.ArrayUtil;
 import org.apache.lucene.util.BitUtil;
 import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.CharsRefBuilder;
+import org.apache.lucene.util.CharsRef;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.Version;
 import org.elasticsearch.common.Nullable;
@@ -111,7 +112,7 @@ public abstract class StreamInput extends InputStream {
      * bytes of the stream.
      */
     public BytesReference readBytesReference() throws IOException {
-        int length = readVInt();
+        int length = readArraySize();
         return readBytesReference(length);
     }
 
@@ -143,7 +144,7 @@ public abstract class StreamInput extends InputStream {
     }
 
     public BytesRef readBytesRef() throws IOException {
-        int length = readVInt();
+        int length = readArraySize();
         return readBytesRef(length);
     }
 
@@ -323,15 +324,22 @@ public abstract class StreamInput extends InputStream {
         return null;
     }
 
-    private final CharsRefBuilder spare = new CharsRefBuilder();
+    // we don't use a CharsRefBuilder since we exactly know the size of the character array up front
+    // this prevents calling grow for every character since we don't need this
+    private final CharsRef spare = new CharsRef();
 
     public String readString() throws IOException {
-        final int charCount = readVInt();
-        spare.clear();
-        spare.grow(charCount);
-        int c;
-        while (spare.length() < charCount) {
-            c = readByte() & 0xff;
+        // TODO it would be nice to not call readByte() for every character but we don't know how much to read up-front
+        // we can make the loop much more complicated but that won't buy us much compared to the bounds checks in readByte()
+        final int charCount = readArraySize();
+        if (spare.chars.length < charCount) {
+            // we don't use ArrayUtils.grow since there is no need to copy the array
+            spare.chars = new char[ArrayUtil.oversize(charCount, Character.BYTES)];
+        }
+        spare.length = charCount;
+        final char[] buffer = spare.chars;
+        for (int i = 0; i < charCount; i++) {
+            final int c = readByte() & 0xff;
             switch (c >> 4) {
                 case 0:
                 case 1:
@@ -341,15 +349,17 @@ public abstract class StreamInput extends InputStream {
                 case 5:
                 case 6:
                 case 7:
-                    spare.append((char) c);
+                    buffer[i] = (char) c;
                     break;
                 case 12:
                 case 13:
-                    spare.append((char) ((c & 0x1F) << 6 | readByte() & 0x3F));
+                    buffer[i] = ((char) ((c & 0x1F) << 6 | readByte() & 0x3F));
                     break;
                 case 14:
-                    spare.append((char) ((c & 0x0F) << 12 | (readByte() & 0x3F) << 6 | (readByte() & 0x3F) << 0));
+                    buffer[i] = ((char) ((c & 0x0F) << 12 | (readByte() & 0x3F) << 6 | (readByte() & 0x3F) << 0));
                     break;
+                default:
+                    new AssertionError("unexpected character: " + c + " hex: " + Integer.toHexString(c));
             }
         }
         return spare.toString();
@@ -401,7 +411,7 @@ public abstract class StreamInput extends InputStream {
     public abstract int available() throws IOException;
 
     public String[] readStringArray() throws IOException {
-        int size = readVInt();
+        int size = readArraySize();
         if (size == 0) {
             return Strings.EMPTY_ARRAY;
         }
@@ -421,7 +431,7 @@ public abstract class StreamInput extends InputStream {
     }
 
     public <K, V> Map<K, V> readMap(Writeable.Reader<K> keyReader, Writeable.Reader<V> valueReader) throws IOException {
-        int size = readVInt();
+        int size = readArraySize();
         Map<K, V> map = new HashMap<>(size);
         for (int i = 0; i < size; i++) {
             K key = keyReader.read(this);
@@ -443,7 +453,7 @@ public abstract class StreamInput extends InputStream {
      */
     public <K, V> Map<K, List<V>> readMapOfLists(final Writeable.Reader<K> keyReader, final Writeable.Reader<V> valueReader)
             throws IOException {
-        final int size = readVInt();
+        final int size = readArraySize();
         if (size == 0) {
             return Collections.emptyMap();
         }
@@ -520,7 +530,7 @@ public abstract class StreamInput extends InputStream {
 
     @SuppressWarnings("unchecked")
     private List readArrayList() throws IOException {
-        int size = readVInt();
+        int size = readArraySize();
         List list = new ArrayList(size);
         for (int i = 0; i < size; i++) {
             list.add(readGenericValue());
@@ -534,7 +544,7 @@ public abstract class StreamInput extends InputStream {
     }
 
     private Object[] readArray() throws IOException {
-        int size8 = readVInt();
+        int size8 = readArraySize();
         Object[] list8 = new Object[size8];
         for (int i = 0; i < size8; i++) {
             list8[i] = readGenericValue();
@@ -543,7 +553,7 @@ public abstract class StreamInput extends InputStream {
     }
 
     private Map readLinkedHashMap() throws IOException {
-        int size9 = readVInt();
+        int size9 = readArraySize();
         Map map9 = new LinkedHashMap(size9);
         for (int i = 0; i < size9; i++) {
             map9.put(readString(), readGenericValue());
@@ -552,7 +562,7 @@ public abstract class StreamInput extends InputStream {
     }
 
     private Map readHashMap() throws IOException {
-        int size10 = readVInt();
+        int size10 = readArraySize();
         Map map10 = new HashMap(size10);
         for (int i = 0; i < size10; i++) {
             map10.put(readString(), readGenericValue());
@@ -589,7 +599,7 @@ public abstract class StreamInput extends InputStream {
     }
 
     public int[] readIntArray() throws IOException {
-        int length = readVInt();
+        int length = readArraySize();
         int[] values = new int[length];
         for (int i = 0; i < length; i++) {
             values[i] = readInt();
@@ -598,7 +608,7 @@ public abstract class StreamInput extends InputStream {
     }
 
     public int[] readVIntArray() throws IOException {
-        int length = readVInt();
+        int length = readArraySize();
         int[] values = new int[length];
         for (int i = 0; i < length; i++) {
             values[i] = readVInt();
@@ -607,7 +617,7 @@ public abstract class StreamInput extends InputStream {
     }
 
     public long[] readLongArray() throws IOException {
-        int length = readVInt();
+        int length = readArraySize();
         long[] values = new long[length];
         for (int i = 0; i < length; i++) {
             values[i] = readLong();
@@ -616,7 +626,7 @@ public abstract class StreamInput extends InputStream {
     }
 
     public long[] readVLongArray() throws IOException {
-        int length = readVInt();
+        int length = readArraySize();
         long[] values = new long[length];
         for (int i = 0; i < length; i++) {
             values[i] = readVLong();
@@ -625,7 +635,7 @@ public abstract class StreamInput extends InputStream {
     }
 
     public float[] readFloatArray() throws IOException {
-        int length = readVInt();
+        int length = readArraySize();
         float[] values = new float[length];
         for (int i = 0; i < length; i++) {
             values[i] = readFloat();
@@ -634,7 +644,7 @@ public abstract class StreamInput extends InputStream {
     }
 
     public double[] readDoubleArray() throws IOException {
-        int length = readVInt();
+        int length = readArraySize();
         double[] values = new double[length];
         for (int i = 0; i < length; i++) {
             values[i] = readDouble();
@@ -643,14 +653,14 @@ public abstract class StreamInput extends InputStream {
     }
 
     public byte[] readByteArray() throws IOException {
-        final int length = readVInt();
+        final int length = readArraySize();
         final byte[] bytes = new byte[length];
         readBytes(bytes, 0, bytes.length);
         return bytes;
     }
 
     public <T> T[] readArray(Writeable.Reader<T> reader, IntFunction<T[]> arraySupplier) throws IOException {
-        int length = readVInt();
+        int length = readArraySize();
         T[] values = arraySupplier.apply(length);
         for (int i = 0; i < length; i++) {
             values[i] = reader.read(this);
@@ -822,7 +832,7 @@ public abstract class StreamInput extends InputStream {
      * @throws IOException if any step fails
      */
     public <T extends Streamable> List<T> readStreamableList(Supplier<T> constructor) throws IOException {
-        int count = readVInt();
+        int count = readArraySize();
         List<T> builder = new ArrayList<>(count);
         for (int i=0; i<count; i++) {
             T instance = constructor.get();
@@ -836,7 +846,7 @@ public abstract class StreamInput extends InputStream {
      * Reads a list of objects
      */
     public <T> List<T> readList(Writeable.Reader<T> reader) throws IOException {
-        int count = readVInt();
+        int count = readArraySize();
         List<T> builder = new ArrayList<>(count);
         for (int i=0; i<count; i++) {
             builder.add(reader.read(this));
@@ -848,7 +858,7 @@ public abstract class StreamInput extends InputStream {
      * Reads a list of {@link NamedWriteable}s.
      */
     public <T extends NamedWriteable> List<T> readNamedWriteableList(Class<T> categoryClass) throws IOException {
-        int count = readVInt();
+        int count = readArraySize();
         List<T> builder = new ArrayList<>(count);
         for (int i=0; i<count; i++) {
             builder.add(readNamedWriteable(categoryClass));
@@ -864,4 +874,29 @@ public abstract class StreamInput extends InputStream {
         return new InputStreamStreamInput(new ByteArrayInputStream(bytes, offset, length));
     }
 
+    /**
+     * Reads a vint via {@link #readVInt()} and applies basic checks to ensure the read array size is sane.
+     * This method uses {@link #ensureCanReadBytes(int)} to ensure this stream has enough bytes to read for the read array size.
+     */
+    private int readArraySize() throws IOException {
+        final int arraySize = readVInt();
+        if (arraySize > ArrayUtil.MAX_ARRAY_LENGTH) {
+            throw new IllegalStateException("array length must be <= to " + ArrayUtil.MAX_ARRAY_LENGTH  + " but was: " + arraySize);
+        }
+        if (arraySize < 0) {
+            throw new NegativeArraySizeException("array size must be positive but was: " + arraySize);
+        }
+        // lets do a sanity check that if we are reading an array size that is bigger that the remaining bytes we can safely
+        // throw an exception instead of allocating the array based on the size. A simple corrutpted byte can make a node go OOM
+        // if the size is large and for perf reasons we allocate arrays ahead of time
+        ensureCanReadBytes(arraySize);
+        return arraySize;
+    }
+
+    /**
+     * This method throws an {@link EOFException} if the given number of bytes can not be read from the this stream. This method might
+     * be a no-op depending on the underlying implementation if the information of the remaining bytes is not present.
+     */
+    protected abstract void ensureCanReadBytes(int length) throws EOFException;
+
 }
diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java b/core/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java
index 3ba911ef9ee..a928e234545 100644
--- a/core/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java
+++ b/core/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java
@@ -24,6 +24,7 @@ import org.apache.lucene.index.IndexFormatTooNewException;
 import org.apache.lucene.index.IndexFormatTooOldException;
 import org.apache.lucene.store.AlreadyClosedException;
 import org.apache.lucene.store.LockObtainFailedException;
+import org.apache.lucene.util.ArrayUtil;
 import org.apache.lucene.util.BitUtil;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.BytesRefBuilder;
@@ -298,23 +299,41 @@ public abstract class StreamOutput extends OutputStream {
         }
     }
 
+    // we use a small buffer to convert strings to bytes since we want to prevent calling writeByte
+    // for every byte in the string (see #21660 for details).
+    // This buffer will never be the oversized limit of 1024 bytes and will not be shared across streams
+    private byte[] convertStringBuffer = BytesRef.EMPTY_BYTES; // TODO should we reduce it to 0 bytes once the stream is closed?
+
     public void writeString(String str) throws IOException {
-        int charCount = str.length();
+        final int charCount = str.length();
+        final int bufferSize = Math.min(3 * charCount, 1024); // at most 3 bytes per character is needed here
+        if (convertStringBuffer.length < bufferSize) { // we don't use ArrayUtils.grow since copying the bytes is unnecessary
+            convertStringBuffer = new byte[ArrayUtil.oversize(bufferSize, Byte.BYTES)];
+        }
+        byte[] buffer = convertStringBuffer;
+        int offset = 0;
         writeVInt(charCount);
-        int c;
         for (int i = 0; i < charCount; i++) {
-            c = str.charAt(i);
+            final int c = str.charAt(i);
             if (c <= 0x007F) {
-                writeByte((byte) c);
+                buffer[offset++] = ((byte) c);
             } else if (c > 0x07FF) {
-                writeByte((byte) (0xE0 | c >> 12 & 0x0F));
-                writeByte((byte) (0x80 | c >> 6 & 0x3F));
-                writeByte((byte) (0x80 | c >> 0 & 0x3F));
+                buffer[offset++] = ((byte) (0xE0 | c >> 12 & 0x0F));
+                buffer[offset++] = ((byte) (0x80 | c >> 6 & 0x3F));
+                buffer[offset++] = ((byte) (0x80 | c >> 0 & 0x3F));
             } else {
-                writeByte((byte) (0xC0 | c >> 6 & 0x1F));
-                writeByte((byte) (0x80 | c >> 0 & 0x3F));
+                buffer[offset++] = ((byte) (0xC0 | c >> 6 & 0x1F));
+                buffer[offset++] = ((byte) (0x80 | c >> 0 & 0x3F));
+            }
+            // make sure any possible char can fit into the buffer in any possible iteration
+            // we need at most 3 bytes so we flush the buffer once we have less than 3 bytes
+            // left before we start another iteration
+            if (offset > buffer.length-3) {
+                writeBytes(buffer, offset);
+                offset = 0;
             }
         }
+        writeBytes(buffer, offset);
     }
 
     public void writeFloat(float v) throws IOException {
@@ -783,7 +802,7 @@ public abstract class StreamOutput extends OutputStream {
                 writeVInt(17);
             } else {
                 ElasticsearchException ex;
-                if (throwable instanceof ElasticsearchException && ElasticsearchException.isRegistered(throwable.getClass())) {
+                if (throwable instanceof ElasticsearchException && ElasticsearchException.isRegistered(throwable.getClass(), version)) {
                     ex = (ElasticsearchException) throwable;
                 } else {
                     ex = new NotSerializableExceptionWrapper(throwable);
diff --git a/core/src/main/java/org/elasticsearch/common/settings/AbstractScopedSettings.java b/core/src/main/java/org/elasticsearch/common/settings/AbstractScopedSettings.java
index e72f274fd62..b993cef9290 100644
--- a/core/src/main/java/org/elasticsearch/common/settings/AbstractScopedSettings.java
+++ b/core/src/main/java/org/elasticsearch/common/settings/AbstractScopedSettings.java
@@ -40,6 +40,7 @@ import java.util.TreeMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
+import java.util.function.Predicate;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
@@ -445,10 +446,18 @@ public abstract class AbstractScopedSettings extends AbstractComponent {
         boolean changed = false;
         final Set<String> toRemove = new HashSet<>();
         Settings.Builder settingsBuilder = Settings.builder();
+        final Predicate<String> canUpdate = (key) -> (onlyDynamic == false && get(key) != null) || hasDynamicSetting(key);
+        final Predicate<String> canRemove = (key) ->( // we can delete if
+            onlyDynamic && hasDynamicSetting(key)  // it's a dynamicSetting and we only do dynamic settings
+            || get(key) == null && key.startsWith(ARCHIVED_SETTINGS_PREFIX) // the setting is not registered AND it's been archived
+            || (onlyDynamic == false && get(key) != null)); // if it's not dynamic AND we have a key
         for (Map.Entry<String, String> entry : toApply.getAsMap().entrySet()) {
-            if (entry.getValue() == null) {
+            if (entry.getValue() == null && (canRemove.test(entry.getKey()) || entry.getKey().endsWith("*"))) {
+                // this either accepts null values that suffice the canUpdate test OR wildcard expressions (key ends with *)
+                // we don't validate if there is any dynamic setting with that prefix yet we could do in the future
                 toRemove.add(entry.getKey());
-            } else if ((onlyDynamic == false && get(entry.getKey()) != null) || hasDynamicSetting(entry.getKey())) {
+                // we don't set changed here it's set after we apply deletes below if something actually changed
+            } else if (entry.getValue() != null && canUpdate.test(entry.getKey())) {
                 validate(entry.getKey(), toApply);
                 settingsBuilder.put(entry.getKey(), entry.getValue());
                 updates.put(entry.getKey(), entry.getValue());
@@ -456,20 +465,22 @@ public abstract class AbstractScopedSettings extends AbstractComponent {
             } else {
                 throw new IllegalArgumentException(type + " setting [" + entry.getKey() + "], not dynamically updateable");
             }
-
         }
-        changed |= applyDeletes(toRemove, target);
+        changed |= applyDeletes(toRemove, target, canRemove);
         target.put(settingsBuilder.build());
         return changed;
     }
 
-    private static boolean applyDeletes(Set<String> deletes, Settings.Builder builder) {
+    private static boolean applyDeletes(Set<String> deletes, Settings.Builder builder, Predicate<String> canRemove) {
         boolean changed = false;
         for (String entry : deletes) {
             Set<String> keysToRemove = new HashSet<>();
             Set<String> keySet = builder.internalMap().keySet();
             for (String key : keySet) {
-                if (Regex.simpleMatch(entry, key)) {
+                if (Regex.simpleMatch(entry, key) && canRemove.test(key)) {
+                    // we have to re-check with canRemove here since we might have a wildcard expression foo.* that matches
+                    // dynamic as well as static settings if that is the case we might remove static settings since we resolve the
+                    // wildcards late
                     keysToRemove.add(key);
                 }
             }
diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/support/XContentMapValues.java b/core/src/main/java/org/elasticsearch/common/xcontent/support/XContentMapValues.java
index a94bf63e270..a1affb4fe57 100644
--- a/core/src/main/java/org/elasticsearch/common/xcontent/support/XContentMapValues.java
+++ b/core/src/main/java/org/elasticsearch/common/xcontent/support/XContentMapValues.java
@@ -24,6 +24,7 @@ import org.apache.lucene.util.automaton.Automaton;
 import org.apache.lucene.util.automaton.CharacterRunAutomaton;
 import org.apache.lucene.util.automaton.Operations;
 import org.elasticsearch.ElasticsearchParseException;
+import org.elasticsearch.common.Numbers;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.regex.Regex;
 import org.elasticsearch.common.unit.TimeValue;
@@ -357,7 +358,7 @@ public class XContentMapValues {
 
     public static int nodeIntegerValue(Object node) {
         if (node instanceof Number) {
-            return ((Number) node).intValue();
+            return Numbers.toIntExact((Number) node);
         }
         return Integer.parseInt(node.toString());
     }
@@ -366,10 +367,7 @@ public class XContentMapValues {
         if (node == null) {
             return defaultValue;
         }
-        if (node instanceof Number) {
-            return ((Number) node).intValue();
-        }
-        return Integer.parseInt(node.toString());
+        return nodeIntegerValue(node);
     }
 
     public static short nodeShortValue(Object node, short defaultValue) {
@@ -381,7 +379,7 @@ public class XContentMapValues {
 
     public static short nodeShortValue(Object node) {
         if (node instanceof Number) {
-            return ((Number) node).shortValue();
+            return Numbers.toShortExact((Number) node);
         }
         return Short.parseShort(node.toString());
     }
@@ -395,7 +393,7 @@ public class XContentMapValues {
 
     public static byte nodeByteValue(Object node) {
         if (node instanceof Number) {
-            return ((Number) node).byteValue();
+            return Numbers.toByteExact((Number) node);
         }
         return Byte.parseByte(node.toString());
     }
@@ -409,7 +407,7 @@ public class XContentMapValues {
 
     public static long nodeLongValue(Object node) {
         if (node instanceof Number) {
-            return ((Number) node).longValue();
+            return Numbers.toLongExact((Number) node);
         }
         return Long.parseLong(node.toString());
     }
diff --git a/core/src/main/java/org/elasticsearch/env/ShardLockObtainFailedException.java b/core/src/main/java/org/elasticsearch/env/ShardLockObtainFailedException.java
index d1a8ce3b6d4..21bba81adbb 100644
--- a/core/src/main/java/org/elasticsearch/env/ShardLockObtainFailedException.java
+++ b/core/src/main/java/org/elasticsearch/env/ShardLockObtainFailedException.java
@@ -19,30 +19,36 @@
 
 package org.elasticsearch.env;
 
+import org.elasticsearch.ElasticsearchException;
+import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.index.shard.ShardId;
 
+import java.io.IOException;
+
 /**
  * Exception used when the in-memory lock for a shard cannot be obtained
  */
-public class ShardLockObtainFailedException extends Exception {
-    private final ShardId shardId;
+public class ShardLockObtainFailedException extends ElasticsearchException {
 
     public ShardLockObtainFailedException(ShardId shardId, String message) {
-        super(message);
-        this.shardId = shardId;
+        super(buildMessage(shardId, message));
+        this.setShard(shardId);
     }
 
     public ShardLockObtainFailedException(ShardId shardId, String message, Throwable cause) {
-        super(message, cause);
-        this.shardId = shardId;
+        super(buildMessage(shardId, message), cause);
+        this.setShard(shardId);
     }
 
-    @Override
-    public String getMessage() {
+    public ShardLockObtainFailedException(StreamInput in) throws IOException {
+        super(in);
+    }
+
+    private static String buildMessage(ShardId shardId, String message) {
         StringBuilder sb = new StringBuilder();
         sb.append(shardId.toString());
         sb.append(": ");
-        sb.append(super.getMessage());
+        sb.append(message);
         return sb.toString();
     }
 }
diff --git a/core/src/main/java/org/elasticsearch/gateway/BaseGatewayShardAllocator.java b/core/src/main/java/org/elasticsearch/gateway/BaseGatewayShardAllocator.java
index 461fcf1e2d2..0e225c7a7f9 100644
--- a/core/src/main/java/org/elasticsearch/gateway/BaseGatewayShardAllocator.java
+++ b/core/src/main/java/org/elasticsearch/gateway/BaseGatewayShardAllocator.java
@@ -22,8 +22,8 @@ package org.elasticsearch.gateway;
 import org.apache.logging.log4j.Logger;
 import org.elasticsearch.cluster.routing.RoutingNodes;
 import org.elasticsearch.cluster.routing.ShardRouting;
+import org.elasticsearch.cluster.routing.allocation.AllocateUnassignedDecision;
 import org.elasticsearch.cluster.routing.allocation.RoutingAllocation;
-import org.elasticsearch.cluster.routing.allocation.ShardAllocationDecision;
 import org.elasticsearch.cluster.routing.allocation.decider.Decision;
 import org.elasticsearch.common.component.AbstractComponent;
 import org.elasticsearch.common.settings.Settings;
@@ -53,21 +53,21 @@ public abstract class BaseGatewayShardAllocator extends AbstractComponent {
         final RoutingNodes.UnassignedShards.UnassignedIterator unassignedIterator = routingNodes.unassigned().iterator();
         while (unassignedIterator.hasNext()) {
             final ShardRouting shard = unassignedIterator.next();
-            final ShardAllocationDecision shardAllocationDecision = makeAllocationDecision(shard, allocation, logger);
+            final AllocateUnassignedDecision allocateUnassignedDecision = makeAllocationDecision(shard, allocation, logger);
 
-            if (shardAllocationDecision.isDecisionTaken() == false) {
+            if (allocateUnassignedDecision.isDecisionTaken() == false) {
                 // no decision was taken by this allocator
                 continue;
             }
 
-            if (shardAllocationDecision.getFinalDecisionSafe() == Decision.Type.YES) {
-                unassignedIterator.initialize(shardAllocationDecision.getAssignedNodeId(),
-                    shardAllocationDecision.getAllocationId(),
+            if (allocateUnassignedDecision.getFinalDecisionSafe() == Decision.Type.YES) {
+                unassignedIterator.initialize(allocateUnassignedDecision.getAssignedNodeId(),
+                    allocateUnassignedDecision.getAllocationId(),
                     shard.primary() ? ShardRouting.UNAVAILABLE_EXPECTED_SHARD_SIZE :
                                       allocation.clusterInfo().getShardSize(shard, ShardRouting.UNAVAILABLE_EXPECTED_SHARD_SIZE),
                     allocation.changes());
             } else {
-                unassignedIterator.removeAndIgnore(shardAllocationDecision.getAllocationStatus(), allocation.changes());
+                unassignedIterator.removeAndIgnore(allocateUnassignedDecision.getAllocationStatus(), allocation.changes());
             }
         }
     }
@@ -80,9 +80,9 @@ public abstract class BaseGatewayShardAllocator extends AbstractComponent {
      * @param unassignedShard  the unassigned shard to allocate
      * @param allocation       the current routing state
      * @param logger           the logger
-     * @return an {@link ShardAllocationDecision} with the final decision of whether to allocate and details of the decision
+     * @return an {@link AllocateUnassignedDecision} with the final decision of whether to allocate and details of the decision
      */
-    public abstract ShardAllocationDecision makeAllocationDecision(ShardRouting unassignedShard,
-                                                                   RoutingAllocation allocation,
-                                                                   Logger logger);
+    public abstract AllocateUnassignedDecision makeAllocationDecision(ShardRouting unassignedShard,
+                                                                      RoutingAllocation allocation,
+                                                                      Logger logger);
 }
diff --git a/core/src/main/java/org/elasticsearch/gateway/PrimaryShardAllocator.java b/core/src/main/java/org/elasticsearch/gateway/PrimaryShardAllocator.java
index 7d8e8327d39..53788f7b84d 100644
--- a/core/src/main/java/org/elasticsearch/gateway/PrimaryShardAllocator.java
+++ b/core/src/main/java/org/elasticsearch/gateway/PrimaryShardAllocator.java
@@ -31,8 +31,8 @@ import org.elasticsearch.cluster.routing.RoutingNode;
 import org.elasticsearch.cluster.routing.RoutingNodes;
 import org.elasticsearch.cluster.routing.ShardRouting;
 import org.elasticsearch.cluster.routing.UnassignedInfo.AllocationStatus;
+import org.elasticsearch.cluster.routing.allocation.AllocateUnassignedDecision;
 import org.elasticsearch.cluster.routing.allocation.RoutingAllocation;
-import org.elasticsearch.cluster.routing.allocation.ShardAllocationDecision;
 import org.elasticsearch.cluster.routing.allocation.decider.Decision;
 import org.elasticsearch.cluster.routing.allocation.decider.Decision.Type;
 import org.elasticsearch.common.settings.Setting;
@@ -110,19 +110,19 @@ public abstract class PrimaryShardAllocator extends BaseGatewayShardAllocator {
     }
 
     @Override
-    public ShardAllocationDecision makeAllocationDecision(final ShardRouting unassignedShard,
-                                                          final RoutingAllocation allocation,
-                                                          final Logger logger) {
+    public AllocateUnassignedDecision makeAllocationDecision(final ShardRouting unassignedShard,
+                                                             final RoutingAllocation allocation,
+                                                             final Logger logger) {
         if (isResponsibleFor(unassignedShard) == false) {
             // this allocator is not responsible for allocating this shard
-            return ShardAllocationDecision.DECISION_NOT_TAKEN;
+            return AllocateUnassignedDecision.NOT_TAKEN;
         }
 
         final boolean explain = allocation.debugDecision();
         final FetchResult<NodeGatewayStartedShards> shardState = fetchData(unassignedShard, allocation);
         if (shardState.hasData() == false) {
             allocation.setHasPendingAsyncFetch();
-            return ShardAllocationDecision.no(AllocationStatus.FETCHING_SHARD_DATA,
+            return AllocateUnassignedDecision.no(AllocationStatus.FETCHING_SHARD_DATA,
                 explain ? "still fetching shard state from the nodes in the cluster" : null);
         }
 
@@ -167,18 +167,18 @@ public abstract class PrimaryShardAllocator extends BaseGatewayShardAllocator {
                 // let BalancedShardsAllocator take care of allocating this shard
                 logger.debug("[{}][{}]: missing local data, will restore from [{}]",
                              unassignedShard.index(), unassignedShard.id(), unassignedShard.recoverySource());
-                return ShardAllocationDecision.DECISION_NOT_TAKEN;
+                return AllocateUnassignedDecision.NOT_TAKEN;
             } else if (recoverOnAnyNode) {
                 // let BalancedShardsAllocator take care of allocating this shard
                 logger.debug("[{}][{}]: missing local data, recover from any node", unassignedShard.index(), unassignedShard.id());
-                return ShardAllocationDecision.DECISION_NOT_TAKEN;
+                return AllocateUnassignedDecision.NOT_TAKEN;
             } else {
                 // We have a shard that was previously allocated, but we could not find a valid shard copy to allocate the primary.
                 // We could just be waiting for the node that holds the primary to start back up, in which case the allocation for
                 // this shard will be picked up when the node joins and we do another allocation reroute
                 logger.debug("[{}][{}]: not allocating, number_of_allocated_shards_found [{}]",
                              unassignedShard.index(), unassignedShard.id(), nodeShardsResult.allocationsFound);
-                return ShardAllocationDecision.no(AllocationStatus.NO_VALID_SHARD_COPY,
+                return AllocateUnassignedDecision.no(AllocationStatus.NO_VALID_SHARD_COPY,
                     explain ? "shard was previously allocated, but no valid shard copy could be found amongst the nodes in the cluster" : null);
             }
         }
@@ -191,7 +191,7 @@ public abstract class PrimaryShardAllocator extends BaseGatewayShardAllocator {
             logger.debug("[{}][{}]: allocating [{}] to [{}] on primary allocation",
                          unassignedShard.index(), unassignedShard.id(), unassignedShard, decidedNode.nodeShardState.getNode());
             final String nodeId = decidedNode.nodeShardState.getNode().getId();
-            return ShardAllocationDecision.yes(nodeId,
+            return AllocateUnassignedDecision.yes(nodeId,
                 "the allocation deciders returned a YES decision to allocate to node [" + nodeId + "]",
                 decidedNode.nodeShardState.allocationId(),
                 buildNodeDecisions(nodesToAllocate, explain));
@@ -207,20 +207,20 @@ public abstract class PrimaryShardAllocator extends BaseGatewayShardAllocator {
                 logger.debug("[{}][{}]: allocating [{}] to [{}] on forced primary allocation",
                              unassignedShard.index(), unassignedShard.id(), unassignedShard, nodeShardState.getNode());
                 final String nodeId = nodeShardState.getNode().getId();
-                return ShardAllocationDecision.yes(nodeId,
+                return AllocateUnassignedDecision.yes(nodeId,
                     "allocating the primary shard to node [" + nodeId+ "], which has a complete copy of the shard data",
                     nodeShardState.allocationId(),
                     buildNodeDecisions(nodesToForceAllocate, explain));
             } else if (nodesToForceAllocate.throttleNodeShards.isEmpty() == false) {
                 logger.debug("[{}][{}]: throttling allocation [{}] to [{}] on forced primary allocation",
                              unassignedShard.index(), unassignedShard.id(), unassignedShard, nodesToForceAllocate.throttleNodeShards);
-                return ShardAllocationDecision.throttle(
+                return AllocateUnassignedDecision.throttle(
                     explain ? "allocation throttled as all nodes to which the shard may be force allocated are busy with other recoveries" : null,
                     buildNodeDecisions(nodesToForceAllocate, explain));
             } else {
                 logger.debug("[{}][{}]: forced primary allocation denied [{}]",
                              unassignedShard.index(), unassignedShard.id(), unassignedShard);
-                return ShardAllocationDecision.no(AllocationStatus.DECIDERS_NO,
+                return AllocateUnassignedDecision.no(AllocationStatus.DECIDERS_NO,
                     explain ? "all nodes that hold a valid shard copy returned a NO decision, and force allocation is not permitted" : null,
                     buildNodeDecisions(nodesToForceAllocate, explain));
             }
@@ -229,7 +229,7 @@ public abstract class PrimaryShardAllocator extends BaseGatewayShardAllocator {
             // taking place on the node currently, ignore it for now
             logger.debug("[{}][{}]: throttling allocation [{}] to [{}] on primary allocation",
                          unassignedShard.index(), unassignedShard.id(), unassignedShard, nodesToAllocate.throttleNodeShards);
-            return ShardAllocationDecision.throttle(
+            return AllocateUnassignedDecision.throttle(
                 explain ? "allocation throttled as all nodes to which the shard may be allocated are busy with other recoveries" : null,
                 buildNodeDecisions(nodesToAllocate, explain));
         }
diff --git a/core/src/main/java/org/elasticsearch/gateway/ReplicaShardAllocator.java b/core/src/main/java/org/elasticsearch/gateway/ReplicaShardAllocator.java
index 4c73ae067b6..89da2300185 100644
--- a/core/src/main/java/org/elasticsearch/gateway/ReplicaShardAllocator.java
+++ b/core/src/main/java/org/elasticsearch/gateway/ReplicaShardAllocator.java
@@ -31,8 +31,8 @@ import org.elasticsearch.cluster.routing.RoutingNodes;
 import org.elasticsearch.cluster.routing.ShardRouting;
 import org.elasticsearch.cluster.routing.UnassignedInfo;
 import org.elasticsearch.cluster.routing.UnassignedInfo.AllocationStatus;
+import org.elasticsearch.cluster.routing.allocation.AllocateUnassignedDecision;
 import org.elasticsearch.cluster.routing.allocation.RoutingAllocation;
-import org.elasticsearch.cluster.routing.allocation.ShardAllocationDecision;
 import org.elasticsearch.cluster.routing.allocation.decider.Decision;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.collect.Tuple;
@@ -139,12 +139,12 @@ public abstract class ReplicaShardAllocator extends BaseGatewayShardAllocator {
     }
 
     @Override
-    public ShardAllocationDecision makeAllocationDecision(final ShardRouting unassignedShard,
-                                                          final RoutingAllocation allocation,
-                                                          final Logger logger) {
+    public AllocateUnassignedDecision makeAllocationDecision(final ShardRouting unassignedShard,
+                                                             final RoutingAllocation allocation,
+                                                             final Logger logger) {
         if (isResponsibleFor(unassignedShard) == false) {
             // this allocator is not responsible for deciding on this shard
-            return ShardAllocationDecision.DECISION_NOT_TAKEN;
+            return AllocateUnassignedDecision.NOT_TAKEN;
         }
 
         final RoutingNodes routingNodes = allocation.routingNodes();
@@ -153,7 +153,7 @@ public abstract class ReplicaShardAllocator extends BaseGatewayShardAllocator {
         Tuple<Decision, Map<String, Decision>> allocateDecision = canBeAllocatedToAtLeastOneNode(unassignedShard, allocation, explain);
         if (allocateDecision.v1().type() != Decision.Type.YES) {
             logger.trace("{}: ignoring allocation, can't be allocated on any node", unassignedShard);
-            return ShardAllocationDecision.no(UnassignedInfo.AllocationStatus.fromDecision(allocateDecision.v1().type()),
+            return AllocateUnassignedDecision.no(UnassignedInfo.AllocationStatus.fromDecision(allocateDecision.v1().type()),
                 explain ? "all nodes returned a " + allocateDecision.v1().type() + " decision for allocating the replica shard" : null,
                 allocateDecision.v2());
         }
@@ -162,7 +162,7 @@ public abstract class ReplicaShardAllocator extends BaseGatewayShardAllocator {
         if (shardStores.hasData() == false) {
             logger.trace("{}: ignoring allocation, still fetching shard stores", unassignedShard);
             allocation.setHasPendingAsyncFetch();
-            return ShardAllocationDecision.no(AllocationStatus.FETCHING_SHARD_DATA,
+            return AllocateUnassignedDecision.no(AllocationStatus.FETCHING_SHARD_DATA,
                 explain ? "still fetching shard state from the nodes in the cluster" : null);
         }
 
@@ -175,7 +175,7 @@ public abstract class ReplicaShardAllocator extends BaseGatewayShardAllocator {
             // will try and recover from
             // Note, this is the existing behavior, as exposed in running CorruptFileTest#testNoPrimaryData
             logger.trace("{}: no primary shard store found or allocated, letting actual allocation figure it out", unassignedShard);
-            return ShardAllocationDecision.DECISION_NOT_TAKEN;
+            return AllocateUnassignedDecision.NOT_TAKEN;
         }
 
         MatchingNodes matchingNodes = findMatchingNodes(unassignedShard, allocation, primaryStore, shardStores, explain);
@@ -189,14 +189,14 @@ public abstract class ReplicaShardAllocator extends BaseGatewayShardAllocator {
                 logger.debug("[{}][{}]: throttling allocation [{}] to [{}] in order to reuse its unallocated persistent store",
                     unassignedShard.index(), unassignedShard.id(), unassignedShard, nodeWithHighestMatch.node());
                 // we are throttling this, as we have enough other shards to allocate to this node, so ignore it for now
-                return ShardAllocationDecision.throttle(
+                return AllocateUnassignedDecision.throttle(
                     explain ? "returned a THROTTLE decision on each node that has an existing copy of the shard, so waiting to re-use one of those copies" : null,
                     matchingNodes.nodeDecisions);
             } else {
                 logger.debug("[{}][{}]: allocating [{}] to [{}] in order to reuse its unallocated persistent store",
                     unassignedShard.index(), unassignedShard.id(), unassignedShard, nodeWithHighestMatch.node());
                 // we found a match
-                return ShardAllocationDecision.yes(nodeWithHighestMatch.nodeId(),
+                return AllocateUnassignedDecision.yes(nodeWithHighestMatch.nodeId(),
                     "allocating to node [" + nodeWithHighestMatch.nodeId() + "] in order to re-use its unallocated persistent store",
                     null,
                     matchingNodes.nodeDecisions);
@@ -206,11 +206,11 @@ public abstract class ReplicaShardAllocator extends BaseGatewayShardAllocator {
             // unassigned due to a node leaving, so we delay allocation of this replica to see if the
             // node with the shard copy will rejoin so we can re-use the copy it has
             logger.debug("{}: allocation of [{}] is delayed", unassignedShard.shardId(), unassignedShard);
-            return ShardAllocationDecision.no(AllocationStatus.DELAYED_ALLOCATION,
+            return AllocateUnassignedDecision.no(AllocationStatus.DELAYED_ALLOCATION,
                 explain ? "not allocating this shard, no nodes contain data for the replica and allocation is delayed" : null);
         }
 
-        return ShardAllocationDecision.DECISION_NOT_TAKEN;
+        return AllocateUnassignedDecision.NOT_TAKEN;
     }
 
     /**
diff --git a/core/src/main/java/org/elasticsearch/index/query/AbstractQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/AbstractQueryBuilder.java
index 3ed3b80fb84..e48373a905c 100644
--- a/core/src/main/java/org/elasticsearch/index/query/AbstractQueryBuilder.java
+++ b/core/src/main/java/org/elasticsearch/index/query/AbstractQueryBuilder.java
@@ -26,10 +26,12 @@ import org.apache.lucene.search.spans.SpanQuery;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.ParseField;
+import org.elasticsearch.common.ParseFieldMatcherSupplier;
 import org.elasticsearch.common.ParsingException;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.lucene.BytesRefs;
+import org.elasticsearch.common.xcontent.AbstractObjectParser;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentLocation;
 import org.elasticsearch.common.xcontent.XContentType;
@@ -300,4 +302,15 @@ public abstract class AbstractQueryBuilder<QB extends AbstractQueryBuilder<QB>>
                     + processedFieldName + "] and [" + currentFieldName + "]");
         }
     }
+
+    /**
+     * Adds {@code boost} and {@code query_name} parsing to the
+     * {@link AbstractObjectParser} passed in. All query builders except
+     * {@link MatchAllQueryBuilder} and {@link MatchNoneQueryBuilder} support these fields so they
+     * should use this method.
+     */
+    protected static void declareStandardFields(AbstractObjectParser<? extends QueryBuilder, ? extends ParseFieldMatcherSupplier> parser) {
+        parser.declareFloat((builder, value) -> builder.boost(value), AbstractQueryBuilder.BOOST_FIELD);
+        parser.declareString((builder, value) -> builder.queryName(value), AbstractQueryBuilder.NAME_FIELD);
+    }
 }
diff --git a/core/src/main/java/org/elasticsearch/index/query/IdsQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/IdsQueryBuilder.java
index c8f9f55f96e..f829c2f45ae 100644
--- a/core/src/main/java/org/elasticsearch/index/query/IdsQueryBuilder.java
+++ b/core/src/main/java/org/elasticsearch/index/query/IdsQueryBuilder.java
@@ -24,25 +24,26 @@ import org.apache.lucene.search.Query;
 import org.elasticsearch.cluster.metadata.MetaData;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.ParsingException;
+import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.lucene.search.Queries;
+import org.elasticsearch.common.xcontent.ObjectParser;
 import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.mapper.Uid;
 import org.elasticsearch.index.mapper.UidFieldMapper;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 
+import static org.elasticsearch.common.xcontent.ObjectParser.fromList;
+
 /**
  * A query that will return only documents matching specific ids (and a type).
  */
@@ -54,23 +55,22 @@ public class IdsQueryBuilder extends AbstractQueryBuilder<IdsQueryBuilder> {
 
     private final Set<String> ids = new HashSet<>();
 
-    private final String[] types;
+    private String[] types = Strings.EMPTY_ARRAY;
 
     /**
-     * Creates a new IdsQueryBuilder without providing the types of the documents to look for
+     * Creates a new IdsQueryBuilder with no types specified upfront
      */
     public IdsQueryBuilder() {
-        this.types = new String[0];
+        // nothing to do
     }
 
     /**
      * Creates a new IdsQueryBuilder by providing the types of the documents to look for
+     * @deprecated Replaced by {@link #types(String...)}
      */
+    @Deprecated
     public IdsQueryBuilder(String... types) {
-        if (types == null) {
-            throw new IllegalArgumentException("[ids] types cannot be null");
-        }
-        this.types = types;
+        types(types);
     }
 
     /**
@@ -88,6 +88,17 @@ public class IdsQueryBuilder extends AbstractQueryBuilder<IdsQueryBuilder> {
         out.writeStringArray(ids.toArray(new String[ids.size()]));
     }
 
+    /**
+     * Add types to query
+     */
+    public IdsQueryBuilder types(String... types) {
+        if (types == null) {
+            throw new IllegalArgumentException("[" + NAME + "] types cannot be null");
+        }
+        this.types = types;
+        return this;
+    }
+
     /**
      * Returns the types used in this query
      */
@@ -100,7 +111,7 @@ public class IdsQueryBuilder extends AbstractQueryBuilder<IdsQueryBuilder> {
      */
     public IdsQueryBuilder addIds(String... ids) {
         if (ids == null) {
-            throw new IllegalArgumentException("[ids] ids cannot be null");
+            throw new IllegalArgumentException("[" + NAME + "] ids cannot be null");
         }
         Collections.addAll(this.ids, ids);
         return this;
@@ -126,71 +137,21 @@ public class IdsQueryBuilder extends AbstractQueryBuilder<IdsQueryBuilder> {
         builder.endObject();
     }
 
-    public static Optional<IdsQueryBuilder> fromXContent(QueryParseContext parseContext) throws IOException {
-        XContentParser parser = parseContext.parser();
-        List<String> ids = new ArrayList<>();
-        List<String> types = new ArrayList<>();
-        float boost = AbstractQueryBuilder.DEFAULT_BOOST;
-        String queryName = null;
+    private static ObjectParser<IdsQueryBuilder, QueryParseContext> PARSER = new ObjectParser<>(NAME,
+            () -> new IdsQueryBuilder());
 
-        String currentFieldName = null;
-        XContentParser.Token token;
-        boolean idsProvided = false;
-        while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
-            if (token == XContentParser.Token.FIELD_NAME) {
-                currentFieldName = parser.currentName();
-            } else if (token == XContentParser.Token.START_ARRAY) {
-                if (parseContext.getParseFieldMatcher().match(currentFieldName, VALUES_FIELD)) {
-                    idsProvided = true;
-                    while ((token = parser.nextToken()) != XContentParser.Token.END_ARRAY) {
-                        if ((token == XContentParser.Token.VALUE_STRING) ||
-                                (token == XContentParser.Token.VALUE_NUMBER)) {
-                            String id = parser.textOrNull();
-                            if (id == null) {
-                                throw new ParsingException(parser.getTokenLocation(), "No value specified for term filter");
-                            }
-                            ids.add(id);
-                        } else {
-                            throw new ParsingException(parser.getTokenLocation(),
-                                    "Illegal value for id, expecting a string or number, got: " + token);
-                        }
-                    }
-                } else if (parseContext.getParseFieldMatcher().match(currentFieldName, TYPE_FIELD)) {
-                    while ((token = parser.nextToken()) != XContentParser.Token.END_ARRAY) {
-                        String value = parser.textOrNull();
-                        if (value == null) {
-                            throw new ParsingException(parser.getTokenLocation(), "No type specified for term filter");
-                        }
-                        types.add(value);
-                    }
-                } else {
-                    throw new ParsingException(parser.getTokenLocation(), "[" + IdsQueryBuilder.NAME +
-                            "] query does not support [" + currentFieldName + "]");
-                }
-            } else if (token.isValue()) {
-                if (parseContext.getParseFieldMatcher().match(currentFieldName, TYPE_FIELD)) {
-                    types = Collections.singletonList(parser.text());
-                } else if (parseContext.getParseFieldMatcher().match(currentFieldName, AbstractQueryBuilder.BOOST_FIELD)) {
-                    boost = parser.floatValue();
-                } else if (parseContext.getParseFieldMatcher().match(currentFieldName, AbstractQueryBuilder.NAME_FIELD)) {
-                    queryName = parser.text();
-                } else {
-                    throw new ParsingException(parser.getTokenLocation(), "[" + IdsQueryBuilder.NAME +
-                            "] query does not support [" + currentFieldName + "]");
-                }
-            } else {
-                throw new ParsingException(parser.getTokenLocation(), "[" + IdsQueryBuilder.NAME +
-                        "] unknown token [" + token + "] after [" + currentFieldName + "]");
-            }
-        }
-        if (!idsProvided) {
-            throw new ParsingException(parser.getTokenLocation(), "[" + IdsQueryBuilder.NAME + "] query, no ids values provided");
-        }
+    static {
+        PARSER.declareStringArray(fromList(String.class, IdsQueryBuilder::types), IdsQueryBuilder.TYPE_FIELD);
+        PARSER.declareStringArray(fromList(String.class, IdsQueryBuilder::addIds), IdsQueryBuilder.VALUES_FIELD);
+        declareStandardFields(PARSER);
+    }
 
-        IdsQueryBuilder query = new IdsQueryBuilder(types.toArray(new String[types.size()]));
-        query.addIds(ids.toArray(new String[ids.size()]));
-        query.boost(boost).queryName(queryName);
-        return Optional.of(query);
+    public static Optional<IdsQueryBuilder> fromXContent(QueryParseContext context) {
+        try {
+            return Optional.of(PARSER.apply(context.parser(), context));
+        } catch (IllegalArgumentException e) {
+            throw new ParsingException(context.parser().getTokenLocation(), e.getMessage(), e);
+        }
     }
 
 
diff --git a/core/src/main/java/org/elasticsearch/index/query/MatchAllQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/MatchAllQueryBuilder.java
index ba704809a4f..0796fb662a6 100644
--- a/core/src/main/java/org/elasticsearch/index/query/MatchAllQueryBuilder.java
+++ b/core/src/main/java/org/elasticsearch/index/query/MatchAllQueryBuilder.java
@@ -20,13 +20,12 @@
 package org.elasticsearch.index.query;
 
 import org.apache.lucene.search.Query;
-import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.ParsingException;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.lucene.search.Queries;
+import org.elasticsearch.common.xcontent.ObjectParser;
 import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentParser;
 
 import java.io.IOException;
 import java.util.Optional;
@@ -48,7 +47,7 @@ public class MatchAllQueryBuilder extends AbstractQueryBuilder<MatchAllQueryBuil
     }
 
     @Override
-    protected void doWriteTo(StreamOutput out) throws IOException {
+    protected void doWriteTo(StreamOutput out) {
         // only superclass has state
     }
 
@@ -59,38 +58,22 @@ public class MatchAllQueryBuilder extends AbstractQueryBuilder<MatchAllQueryBuil
         builder.endObject();
     }
 
-    public static Optional<MatchAllQueryBuilder> fromXContent(QueryParseContext parseContext) throws IOException {
-        XContentParser parser = parseContext.parser();
+    private static ObjectParser<MatchAllQueryBuilder, QueryParseContext> PARSER = new ObjectParser<>(NAME, MatchAllQueryBuilder::new);
 
-        String currentFieldName = null;
-        XContentParser.Token token;
-        String queryName = null;
-        float boost = AbstractQueryBuilder.DEFAULT_BOOST;
-        while (((token = parser.nextToken()) != XContentParser.Token.END_OBJECT && token != XContentParser.Token.END_ARRAY)) {
-            if (token == XContentParser.Token.FIELD_NAME) {
-                currentFieldName = parser.currentName();
-            } else if (token.isValue()) {
-                if (parseContext.getParseFieldMatcher().match(currentFieldName, AbstractQueryBuilder.NAME_FIELD)) {
-                    queryName = parser.text();
-                } else if (parseContext.getParseFieldMatcher().match(currentFieldName, AbstractQueryBuilder.BOOST_FIELD)) {
-                    boost = parser.floatValue();
-                } else {
-                    throw new ParsingException(parser.getTokenLocation(), "[" + MatchAllQueryBuilder.NAME +
-                            "] query does not support [" + currentFieldName + "]");
-                }
-            } else {
-                throw new ParsingException(parser.getTokenLocation(), "[" + MatchAllQueryBuilder.NAME +
-                        "] unknown token [" + token + "] after [" + currentFieldName + "]");
-            }
+    static {
+        declareStandardFields(PARSER);
+    }
+
+    public static Optional<MatchAllQueryBuilder> fromXContent(QueryParseContext context) {
+        try {
+            return Optional.of(PARSER.apply(context.parser(), context));
+        } catch (IllegalArgumentException e) {
+            throw new ParsingException(context.parser().getTokenLocation(), e.getMessage(), e);
         }
-        MatchAllQueryBuilder queryBuilder = new MatchAllQueryBuilder();
-        queryBuilder.boost(boost);
-        queryBuilder.queryName(queryName);
-        return Optional.of(queryBuilder);
     }
 
     @Override
-    protected Query doToQuery(QueryShardContext context) throws IOException {
+    protected Query doToQuery(QueryShardContext context) {
         return Queries.newMatchAllQuery();
     }
 
diff --git a/core/src/main/java/org/elasticsearch/index/query/QueryBuilders.java b/core/src/main/java/org/elasticsearch/index/query/QueryBuilders.java
index d63696ec4fb..2765eaa38ca 100644
--- a/core/src/main/java/org/elasticsearch/index/query/QueryBuilders.java
+++ b/core/src/main/java/org/elasticsearch/index/query/QueryBuilders.java
@@ -29,12 +29,10 @@ import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
 import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
 import org.elasticsearch.indices.TermsLookup;
 import org.elasticsearch.script.Script;
-import org.elasticsearch.script.ScriptService;
 
 import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 
 /**
  * A static factory for simple "import static" usage.
@@ -120,7 +118,7 @@ public abstract class QueryBuilders {
      * @param types The mapping/doc type
      */
     public static IdsQueryBuilder idsQuery(String... types) {
-        return new IdsQueryBuilder(types);
+        return new IdsQueryBuilder().types(types);
     }
 
     /**
diff --git a/core/src/main/java/org/elasticsearch/index/query/QueryStringQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/QueryStringQueryBuilder.java
index 08318874df2..f55a0c08149 100644
--- a/core/src/main/java/org/elasticsearch/index/query/QueryStringQueryBuilder.java
+++ b/core/src/main/java/org/elasticsearch/index/query/QueryStringQueryBuilder.java
@@ -964,8 +964,8 @@ public class QueryStringQueryBuilder extends AbstractQueryBuilder<QueryStringQue
                         this.fieldsAndWeights.size() == 0)) {
             // Use the automatically determined expansion of all queryable fields
             resolvedFields = allQueryableDefaultFields(context);
-            // Automatically set leniency to "true" so mismatched fields don't cause exceptions
-            qpSettings.lenient(true);
+            // Automatically set leniency to "true" if unset so mismatched fields don't cause exceptions
+            qpSettings.lenient(lenient == null ? true : lenient);
         } else {
             qpSettings.defaultField(this.defaultField == null ? context.defaultField() : this.defaultField);
 
diff --git a/core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringBuilder.java b/core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringBuilder.java
index 5bc04d13f8b..92c0dfdcfe7 100644
--- a/core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringBuilder.java
+++ b/core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringBuilder.java
@@ -129,6 +129,8 @@ public class SimpleQueryStringBuilder extends AbstractQueryBuilder<SimpleQuerySt
     private int flags = DEFAULT_FLAGS;
     /** Flag specifying whether query should be forced to expand to all searchable fields */
     private Boolean useAllFields;
+    /** Whether or not the lenient flag has been set or not */
+    private boolean lenientSet = false;
 
     /** Further search settings needed by the ES specific query string parser only. */
     private Settings settings = new Settings();
@@ -162,6 +164,9 @@ public class SimpleQueryStringBuilder extends AbstractQueryBuilder<SimpleQuerySt
             in.readBoolean(); // lowercase_expanded_terms
         }
         settings.lenient(in.readBoolean());
+        if (in.getVersion().onOrAfter(V_5_1_0_UNRELEASED)) {
+            this.lenientSet = in.readBoolean();
+        }
         settings.analyzeWildcard(in.readBoolean());
         if (in.getVersion().before(V_5_1_0_UNRELEASED)) {
             in.readString(); // locale
@@ -188,6 +193,9 @@ public class SimpleQueryStringBuilder extends AbstractQueryBuilder<SimpleQuerySt
             out.writeBoolean(true); // lowercase_expanded_terms
         }
         out.writeBoolean(settings.lenient());
+        if (out.getVersion().onOrAfter(V_5_1_0_UNRELEASED)) {
+            out.writeBoolean(lenientSet);
+        }
         out.writeBoolean(settings.analyzeWildcard());
         if (out.getVersion().before(V_5_1_0_UNRELEASED)) {
             out.writeString(Locale.ROOT.toLanguageTag()); // locale
@@ -315,6 +323,7 @@ public class SimpleQueryStringBuilder extends AbstractQueryBuilder<SimpleQuerySt
     /** Specifies whether query parsing should be lenient. Defaults to false. */
     public SimpleQueryStringBuilder lenient(boolean lenient) {
         this.settings.lenient(lenient);
+        this.lenientSet = true;
         return this;
     }
 
@@ -372,7 +381,7 @@ public class SimpleQueryStringBuilder extends AbstractQueryBuilder<SimpleQuerySt
                         this.fieldsAndWeights.isEmpty())) {
             resolvedFieldsAndWeights = QueryStringQueryBuilder.allQueryableDefaultFields(context);
             // Need to use lenient mode when using "all-mode" so exceptions aren't thrown due to mismatched types
-            newSettings.lenient(true);
+            newSettings.lenient(lenientSet ? settings.lenient() : true);
         } else {
             // Use the default field if no fields specified
             if (fieldsAndWeights.isEmpty()) {
@@ -444,7 +453,9 @@ public class SimpleQueryStringBuilder extends AbstractQueryBuilder<SimpleQuerySt
 
         builder.field(FLAGS_FIELD.getPreferredName(), flags);
         builder.field(DEFAULT_OPERATOR_FIELD.getPreferredName(), defaultOperator.name().toLowerCase(Locale.ROOT));
-        builder.field(LENIENT_FIELD.getPreferredName(), settings.lenient());
+        if (lenientSet) {
+            builder.field(LENIENT_FIELD.getPreferredName(), settings.lenient());
+        }
         builder.field(ANALYZE_WILDCARD_FIELD.getPreferredName(), settings.analyzeWildcard());
         if (settings.quoteFieldSuffix() != null) {
             builder.field(QUOTE_FIELD_SUFFIX_FIELD.getPreferredName(), settings.quoteFieldSuffix());
@@ -473,7 +484,7 @@ public class SimpleQueryStringBuilder extends AbstractQueryBuilder<SimpleQuerySt
         Operator defaultOperator = null;
         String analyzerName = null;
         int flags = SimpleQueryStringFlag.ALL.value();
-        boolean lenient = SimpleQueryStringBuilder.DEFAULT_LENIENT;
+        Boolean lenient = null;
         boolean analyzeWildcard = SimpleQueryStringBuilder.DEFAULT_ANALYZE_WILDCARD;
         String quoteFieldSuffix = null;
         Boolean useAllFields = null;
@@ -565,7 +576,10 @@ public class SimpleQueryStringBuilder extends AbstractQueryBuilder<SimpleQuerySt
         SimpleQueryStringBuilder qb = new SimpleQueryStringBuilder(queryBody);
         qb.boost(boost).fields(fieldsAndWeights).analyzer(analyzerName).queryName(queryName).minimumShouldMatch(minimumShouldMatch);
         qb.flags(flags).defaultOperator(defaultOperator);
-        qb.lenient(lenient).analyzeWildcard(analyzeWildcard).boost(boost).quoteFieldSuffix(quoteFieldSuffix);
+        if (lenient != null) {
+            qb.lenient(lenient);
+        }
+        qb.analyzeWildcard(analyzeWildcard).boost(boost).quoteFieldSuffix(quoteFieldSuffix);
         qb.useAllFields(useAllFields);
         return Optional.of(qb);
     }
diff --git a/core/src/main/java/org/elasticsearch/index/search/MatchQuery.java b/core/src/main/java/org/elasticsearch/index/search/MatchQuery.java
index cf8be75306f..46eb6b7d399 100644
--- a/core/src/main/java/org/elasticsearch/index/search/MatchQuery.java
+++ b/core/src/main/java/org/elasticsearch/index/search/MatchQuery.java
@@ -25,6 +25,7 @@ import org.apache.lucene.queries.ExtendedCommonTermsQuery;
 import org.apache.lucene.search.BooleanClause;
 import org.apache.lucene.search.BooleanClause.Occur;
 import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.BoostQuery;
 import org.apache.lucene.search.FuzzyQuery;
 import org.apache.lucene.search.MultiPhraseQuery;
 import org.apache.lucene.search.MultiTermQuery;
@@ -303,31 +304,38 @@ public class MatchQuery {
 
         public Query createPhrasePrefixQuery(String field, String queryText, int phraseSlop, int maxExpansions) {
             final Query query = createFieldQuery(getAnalyzer(), Occur.MUST, field, queryText, true, phraseSlop);
+            float boost = 1;
+            Query innerQuery = query;
+            while (innerQuery instanceof BoostQuery) {
+                BoostQuery bq = (BoostQuery) innerQuery;
+                boost *= bq.getBoost();
+                innerQuery = bq.getQuery();
+            }
             final MultiPhrasePrefixQuery prefixQuery = new MultiPhrasePrefixQuery();
             prefixQuery.setMaxExpansions(maxExpansions);
             prefixQuery.setSlop(phraseSlop);
-            if (query instanceof PhraseQuery) {
-                PhraseQuery pq = (PhraseQuery)query;
+            if (innerQuery instanceof PhraseQuery) {
+                PhraseQuery pq = (PhraseQuery) innerQuery;
                 Term[] terms = pq.getTerms();
                 int[] positions = pq.getPositions();
                 for (int i = 0; i < terms.length; i++) {
                     prefixQuery.add(new Term[] {terms[i]}, positions[i]);
                 }
-                return prefixQuery;
-            } else if (query instanceof MultiPhraseQuery) {
-                MultiPhraseQuery pq = (MultiPhraseQuery)query;
+                return boost == 1 ? prefixQuery : new BoostQuery(prefixQuery, boost);
+            } else if (innerQuery instanceof MultiPhraseQuery) {
+                MultiPhraseQuery pq = (MultiPhraseQuery) innerQuery;
                 Term[][] terms = pq.getTermArrays();
                 int[] positions = pq.getPositions();
                 for (int i = 0; i < terms.length; i++) {
                     prefixQuery.add(terms[i], positions[i]);
                 }
-                return prefixQuery;
-            } else if (query instanceof TermQuery) {
-                prefixQuery.add(((TermQuery) query).getTerm());
-                return prefixQuery;
-            } else if (query instanceof AllTermQuery) {
-                prefixQuery.add(((AllTermQuery) query).getTerm());
-                return prefixQuery;
+                return boost == 1 ? prefixQuery : new BoostQuery(prefixQuery, boost);
+            } else if (innerQuery instanceof TermQuery) {
+                prefixQuery.add(((TermQuery) innerQuery).getTerm());
+                return boost == 1 ? prefixQuery : new BoostQuery(prefixQuery, boost);
+            } else if (innerQuery instanceof AllTermQuery) {
+                prefixQuery.add(((AllTermQuery) innerQuery).getTerm());
+                return boost == 1 ? prefixQuery : new BoostQuery(prefixQuery, boost);
             }
             return query;
         }
diff --git a/core/src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamInput.java b/core/src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamInput.java
index 58aa60a23c8..ba6da4ba522 100644
--- a/core/src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamInput.java
+++ b/core/src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamInput.java
@@ -20,8 +20,10 @@
 package org.elasticsearch.index.translog;
 
 import org.apache.lucene.store.BufferedChecksum;
+import org.elasticsearch.common.io.stream.FilterStreamInput;
 import org.elasticsearch.common.io.stream.StreamInput;
 
+import java.io.EOFException;
 import java.io.IOException;
 import java.util.zip.CRC32;
 import java.util.zip.Checksum;
@@ -30,19 +32,18 @@ import java.util.zip.Checksum;
  * Similar to Lucene's BufferedChecksumIndexInput, however this wraps a
  * {@link StreamInput} so anything read will update the checksum
  */
-public final class BufferedChecksumStreamInput extends StreamInput {
+public final class BufferedChecksumStreamInput extends FilterStreamInput {
     private static final int SKIP_BUFFER_SIZE = 1024;
     private byte[] skipBuffer;
-    private final StreamInput in;
     private final Checksum digest;
 
     public BufferedChecksumStreamInput(StreamInput in) {
-        this.in = in;
+        super(in);
         this.digest = new BufferedChecksum(new CRC32());
     }
 
     public BufferedChecksumStreamInput(StreamInput in, BufferedChecksumStreamInput reuse) {
-        this.in = in;
+        super(in);
         if (reuse == null ) {
             this.digest = new BufferedChecksum(new CRC32());
         } else {
@@ -58,20 +59,20 @@ public final class BufferedChecksumStreamInput extends StreamInput {
 
     @Override
     public byte readByte() throws IOException {
-        final byte b = in.readByte();
+        final byte b = delegate.readByte();
         digest.update(b);
         return b;
     }
 
     @Override
     public void readBytes(byte[] b, int offset, int len) throws IOException {
-        in.readBytes(b, offset, len);
+        delegate.readBytes(b, offset, len);
         digest.update(b, offset, len);
     }
 
     @Override
     public void reset() throws IOException {
-        in.reset();
+        delegate.reset();
         digest.reset();
     }
 
@@ -80,14 +81,9 @@ public final class BufferedChecksumStreamInput extends StreamInput {
         return readByte() & 0xFF;
     }
 
-    @Override
-    public void close() throws IOException {
-        in.close();
-    }
-
     @Override
     public boolean markSupported() {
-        return in.markSupported();
+        return delegate.markSupported();
     }
 
 
@@ -109,17 +105,14 @@ public final class BufferedChecksumStreamInput extends StreamInput {
         return skipped;
     }
 
-    @Override
-    public int available() throws IOException {
-        return in.available();
-    }
 
     @Override
     public synchronized void mark(int readlimit) {
-        in.mark(readlimit);
+        delegate.mark(readlimit);
     }
 
     public void resetDigest() {
         digest.reset();
     }
+
 }
diff --git a/core/src/main/java/org/elasticsearch/node/Node.java b/core/src/main/java/org/elasticsearch/node/Node.java
index 298d6712ff0..3be9f757125 100644
--- a/core/src/main/java/org/elasticsearch/node/Node.java
+++ b/core/src/main/java/org/elasticsearch/node/Node.java
@@ -252,11 +252,15 @@ public class Node implements Closeable {
             }
 
             final boolean hadPredefinedNodeName = NODE_NAME_SETTING.exists(tmpSettings);
-                tmpSettings = addNodeNameIfNeeded(tmpSettings, nodeEnvironment.nodeId());
             Logger logger = Loggers.getLogger(Node.class, tmpSettings);
+            final String nodeId = nodeEnvironment.nodeId();
+            tmpSettings = addNodeNameIfNeeded(tmpSettings, nodeId);
+            // this must be captured after the node name is possibly added to the settings
+            final String nodeName = NODE_NAME_SETTING.get(tmpSettings);
             if (hadPredefinedNodeName == false) {
-                logger.info("node name [{}] derived from node ID; set [{}] to override",
-                    NODE_NAME_SETTING.get(tmpSettings), NODE_NAME_SETTING.getKey());
+                logger.info("node name [{}] derived from node ID [{}]; set [{}] to override", nodeName, nodeId, NODE_NAME_SETTING.getKey());
+            } else {
+                logger.info("node name [{}], node ID [{}]", nodeName, nodeId);
             }
 
             final JvmInfo jvmInfo = JvmInfo.jvmInfo();
@@ -319,7 +323,7 @@ public class Node implements Closeable {
             final ClusterService clusterService = new ClusterService(settings, settingsModule.getClusterSettings(), threadPool);
             clusterService.add(scriptModule.getScriptService());
             resourcesToClose.add(clusterService);
-            final TribeService tribeService = new TribeService(settings, clusterService, nodeEnvironment.nodeId(),
+            final TribeService tribeService = new TribeService(settings, clusterService, nodeId,
                 s -> newTribeClientNode(s, classpathPlugins));
             resourcesToClose.add(tribeService);
             final IngestService ingestService = new IngestService(settings, threadPool, this.environment,
@@ -734,7 +738,7 @@ public class Node implements Closeable {
             toClose.add(() -> stopWatch.stop().start("plugin(" + plugin.getClass().getName() + ")"));
             toClose.add(plugin);
         }
-        toClose.addAll(pluginsService.filterPlugins(Closeable.class));
+        toClose.addAll(pluginsService.filterPlugins(Plugin.class));
 
         toClose.add(() -> stopWatch.stop().start("script"));
         toClose.add(injector.getInstance(ScriptService.class));
diff --git a/core/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java b/core/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java
index 43af643854e..bbf783d4e85 100644
--- a/core/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java
+++ b/core/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java
@@ -47,9 +47,12 @@ import java.net.URLConnection;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.DirectoryStream;
+import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
 import java.nio.file.StandardCopyOption;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.nio.file.attribute.PosixFileAttributeView;
 import java.nio.file.attribute.PosixFileAttributes;
 import java.nio.file.attribute.PosixFilePermission;
@@ -493,15 +496,24 @@ class InstallPluginCommand extends SettingCommand {
             }
 
             Files.move(tmpRoot, destination, StandardCopyOption.ATOMIC_MOVE);
-            try (DirectoryStream<Path> stream = Files.newDirectoryStream(destination)) {
-                for (Path pluginFile : stream) {
+            Files.walkFileTree(destination, new SimpleFileVisitor<Path>() {
+                @Override
+                public FileVisitResult visitFile(Path pluginFile, BasicFileAttributes attrs) throws IOException {
                     if (Files.isDirectory(pluginFile)) {
                         setFileAttributes(pluginFile, PLUGIN_DIR_PERMS);
                     } else {
-                        setFileAttributes(pluginFile, PLUGIN_FILES_PERMS);
+                        // There can also be "bin" directories under the plugin directory, storing native code executables
+                        Path parentDir = pluginFile.getParent().getFileName();
+                        if ("bin".equals(parentDir.toString())) {
+                            setFileAttributes(pluginFile, BIN_FILES_PERMS);
+                        } else {
+                            setFileAttributes(pluginFile, PLUGIN_FILES_PERMS);
+                        }
                     }
+                    return FileVisitResult.CONTINUE;
                 }
-            }
+            });
+
             terminal.println("-> Installed " + info.getName());
 
         } catch (Exception installProblem) {
diff --git a/core/src/main/java/org/elasticsearch/plugins/Plugin.java b/core/src/main/java/org/elasticsearch/plugins/Plugin.java
index 7bb554df9a3..cc548b52f67 100644
--- a/core/src/main/java/org/elasticsearch/plugins/Plugin.java
+++ b/core/src/main/java/org/elasticsearch/plugins/Plugin.java
@@ -19,6 +19,8 @@
 
 package org.elasticsearch.plugins;
 
+import java.io.Closeable;
+import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -70,7 +72,7 @@ import java.util.function.UnaryOperator;
  * methods should cause any extensions of {@linkplain Plugin} that used the pre-5.x style extension syntax to fail to build and point the
  * plugin author at the new extension syntax. We hope that these make the process of upgrading a plugin from 2.x to 5.x only mildly painful.
  */
-public abstract class Plugin {
+public abstract class Plugin implements Closeable {
 
     /**
      * Node level guice modules.
@@ -162,6 +164,16 @@ public abstract class Plugin {
         return Collections.emptyList();
     }
 
+    /**
+     * Close the resources opened by this plugin.
+     *
+     * @throws IOException if the plugin failed to close its resources
+     */
+    @Override
+    public void close() throws IOException {
+
+    }
+
     /**
      * Old-style guice index level extension point. {@code @Deprecated} and {@code final} to act as a signpost for plugin authors upgrading
      * from 2.x.
diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/PlainHighlighter.java b/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/PlainHighlighter.java
index e821b0fd9a8..127a008f9cc 100644
--- a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/PlainHighlighter.java
+++ b/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/PlainHighlighter.java
@@ -31,6 +31,7 @@ import org.apache.lucene.search.highlight.SimpleFragmenter;
 import org.apache.lucene.search.highlight.SimpleHTMLFormatter;
 import org.apache.lucene.search.highlight.SimpleSpanFragmenter;
 import org.apache.lucene.search.highlight.TextFragment;
+import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.BytesRefHash;
 import org.apache.lucene.util.CollectionUtil;
 import org.elasticsearch.ExceptionsHelper;
@@ -106,7 +107,12 @@ public class PlainHighlighter implements Highlighter {
             textsToHighlight = HighlightUtils.loadFieldValues(field, mapper, context, hitContext);
 
             for (Object textToHighlight : textsToHighlight) {
-                String text = textToHighlight.toString();
+                String text;
+                if (textToHighlight instanceof BytesRef) {
+                    text = mapper.fieldType().valueForDisplay(textToHighlight).toString();
+                } else {
+                    text = textToHighlight.toString();
+                }
 
                 try (TokenStream tokenStream = analyzer.tokenStream(mapper.fieldType().name(), text)) {
                     if (!tokenStream.hasAttribute(CharTermAttribute.class) || !tokenStream.hasAttribute(OffsetAttribute.class)) {
diff --git a/core/src/main/java/org/elasticsearch/tribe/TribeService.java b/core/src/main/java/org/elasticsearch/tribe/TribeService.java
index 69ad77fc91e..f8d2ceb56d0 100644
--- a/core/src/main/java/org/elasticsearch/tribe/TribeService.java
+++ b/core/src/main/java/org/elasticsearch/tribe/TribeService.java
@@ -58,7 +58,6 @@ import org.elasticsearch.env.Environment;
 import org.elasticsearch.env.NodeEnvironment;
 import org.elasticsearch.gateway.GatewayService;
 import org.elasticsearch.node.Node;
-import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.transport.TransportSettings;
 
@@ -72,6 +71,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import static java.util.Collections.unmodifiableMap;
 
@@ -134,6 +134,29 @@ public class TribeService extends AbstractLifecycleComponent {
         return sb.build();
     }
 
+    /**
+     * Interface to allow merging {@link org.elasticsearch.cluster.metadata.MetaData.Custom} in tribe node
+     * When multiple Mergable Custom metadata of the same type is found (from underlying clusters), the
+     * Custom metadata will be merged using {@link #merge(MetaData.Custom)} and the result will be stored
+     * in the tribe cluster state
+     *
+     * @param <T> type of custom meta data
+     */
+    public interface MergableCustomMetaData<T extends MetaData.Custom> {
+
+        /**
+         * Merges this custom metadata with other, returning either this or <code>other</code> custom metadata
+         * for tribe cluster state. This method should not mutate either <code>this</code> or the
+         * <code>other</code> custom metadata.
+         *
+         * @param other custom meta data
+         * @return the same instance or <code>other</code> custom metadata based on implementation
+         *         if both the instances are considered equal, implementations should return this
+         *         instance to avoid redundant cluster state changes.
+         */
+        T merge(T other);
+    }
+
     // internal settings only
     public static final Setting<String> TRIBE_NAME_SETTING = Setting.simpleString("tribe.name", Property.NodeScope);
     private final ClusterService clusterService;
@@ -270,7 +293,7 @@ public class TribeService extends AbstractLifecycleComponent {
     public void startNodes() {
         for (Node node : nodes) {
             try {
-                node.injector().getInstance(ClusterService.class).add(new TribeClusterStateListener(node));
+                getClusterService(node).add(new TribeClusterStateListener(node));
                 node.start();
             } catch (Exception e) {
                 // calling close is safe for non started nodes, we can just iterate over all
@@ -348,23 +371,19 @@ public class TribeService extends AbstractLifecycleComponent {
 
         @Override
         public BatchResult<ClusterChangedEvent> execute(ClusterState currentState, List<ClusterChangedEvent> tasks) throws Exception {
-            ClusterState accumulator = ClusterState.builder(currentState).build();
             BatchResult.Builder<ClusterChangedEvent> builder = BatchResult.builder();
-
-            try {
-                // we only need to apply the latest cluster state update
-                accumulator = applyUpdate(accumulator, tasks.get(tasks.size() - 1));
-                builder.successes(tasks);
-            } catch (Exception e) {
-                builder.failures(tasks, e);
-            }
-
-            return builder.build(accumulator);
+            ClusterState.Builder newState = ClusterState.builder(currentState).incrementVersion();
+            boolean clusterStateChanged = updateNodes(currentState, tasks, newState);
+            clusterStateChanged |= updateIndicesAndMetaData(currentState, tasks, newState);
+            builder.successes(tasks);
+            return builder.build(clusterStateChanged ? newState.build() : currentState);
         }
 
-        private ClusterState applyUpdate(ClusterState currentState, ClusterChangedEvent task) {
+        private boolean updateNodes(ClusterState currentState, List<ClusterChangedEvent> tasks, ClusterState.Builder newState) {
             boolean clusterStateChanged = false;
-            ClusterState tribeState = task.state();
+            // we only need to apply the latest cluster state update
+            ClusterChangedEvent latestTask = tasks.get(tasks.size() - 1);
+            ClusterState tribeState = latestTask.state();
             DiscoveryNodes.Builder nodes = DiscoveryNodes.builder(currentState.nodes());
             // -- merge nodes
             // go over existing nodes, and see if they need to be removed
@@ -385,16 +404,25 @@ public class TribeService extends AbstractLifecycleComponent {
                     Map<String, String> tribeAttr = new HashMap<>(tribe.getAttributes());
                     tribeAttr.put(TRIBE_NAME_SETTING.getKey(), tribeName);
                     DiscoveryNode discoNode = new DiscoveryNode(tribe.getName(), tribe.getId(), tribe.getEphemeralId(),
-                        tribe.getHostName(), tribe.getHostAddress(), tribe.getAddress(), unmodifiableMap(tribeAttr), tribe.getRoles(),
-                        tribe.getVersion());
+                            tribe.getHostName(), tribe.getHostAddress(), tribe.getAddress(), unmodifiableMap(tribeAttr), tribe.getRoles(),
+                            tribe.getVersion());
                     clusterStateChanged = true;
                     logger.info("[{}] adding node [{}]", tribeName, discoNode);
                     nodes.remove(tribe.getId()); // remove any existing node with the same id but different ephemeral id
                     nodes.add(discoNode);
                 }
             }
+            if (clusterStateChanged) {
+                newState.nodes(nodes);
+            }
+            return clusterStateChanged;
+        }
 
-            // -- merge metadata
+        private boolean updateIndicesAndMetaData(ClusterState currentState, List<ClusterChangedEvent> tasks, ClusterState.Builder newState) {
+            // we only need to apply the latest cluster state update
+            ClusterChangedEvent latestTask = tasks.get(tasks.size() - 1);
+            ClusterState tribeState = latestTask.state();
+            boolean clusterStateChanged = false;
             ClusterBlocks.Builder blocks = ClusterBlocks.builder().blocks(currentState.blocks());
             MetaData.Builder metaData = MetaData.builder(currentState.metaData());
             RoutingTable.Builder routingTable = RoutingTable.builder(currentState.routingTable());
@@ -462,13 +490,49 @@ public class TribeService extends AbstractLifecycleComponent {
                     }
                 }
             }
-
-            if (!clusterStateChanged) {
-                return currentState;
-            } else {
-                return ClusterState.builder(currentState).incrementVersion().blocks(blocks).nodes(nodes).metaData(metaData)
-                        .routingTable(routingTable.build()).build();
+            clusterStateChanged |= updateCustoms(currentState, tasks, metaData);
+            if (clusterStateChanged) {
+                newState.blocks(blocks);
+                newState.metaData(metaData);
+                newState.routingTable(routingTable.build());
             }
+            return clusterStateChanged;
+        }
+
+        private boolean updateCustoms(ClusterState currentState, List<ClusterChangedEvent> tasks, MetaData.Builder metaData) {
+            boolean clusterStateChanged = false;
+            Set<String> changedCustomMetaDataTypeSet = tasks.stream()
+                    .map(ClusterChangedEvent::changedCustomMetaDataSet)
+                    .flatMap(Collection::stream)
+                    .collect(Collectors.toSet());
+            final List<Node> tribeClientNodes = TribeService.this.nodes;
+            Map<String, MetaData.Custom> mergedCustomMetaDataMap = mergeChangedCustomMetaData(changedCustomMetaDataTypeSet,
+                    customMetaDataType -> tribeClientNodes.stream()
+                            .map(TribeService::getClusterService).map(ClusterService::state)
+                            .map(ClusterState::metaData)
+                            .map(clusterMetaData -> ((MetaData.Custom) clusterMetaData.custom(customMetaDataType)))
+                            .filter(custom1 -> custom1 != null && custom1 instanceof MergableCustomMetaData)
+                            .map(custom2 -> (MergableCustomMetaData) custom2)
+                            .collect(Collectors.toList())
+            );
+            for (String changedCustomMetaDataType : changedCustomMetaDataTypeSet) {
+                MetaData.Custom mergedCustomMetaData = mergedCustomMetaDataMap.get(changedCustomMetaDataType);
+                if (mergedCustomMetaData == null) {
+                    // we ignore merging custom md which doesn't implement MergableCustomMetaData interface
+                    if (currentState.metaData().custom(changedCustomMetaDataType) instanceof MergableCustomMetaData) {
+                        // custom md has been removed
+                        clusterStateChanged = true;
+                        logger.info("[{}] removing custom meta data type [{}]", tribeName, changedCustomMetaDataType);
+                        metaData.removeCustom(changedCustomMetaDataType);
+                    }
+                } else {
+                    // custom md has been changed
+                    clusterStateChanged = true;
+                    logger.info("[{}] updating custom meta data type [{}] data [{}]", tribeName, changedCustomMetaDataType, mergedCustomMetaData);
+                    metaData.putCustom(changedCustomMetaDataType, mergedCustomMetaData);
+                }
+            }
+            return clusterStateChanged;
         }
 
         private void removeIndex(ClusterBlocks.Builder blocks, MetaData.Builder metaData, RoutingTable.Builder routingTable,
@@ -494,4 +558,23 @@ public class TribeService extends AbstractLifecycleComponent {
             }
         }
     }
+
+    private static ClusterService getClusterService(Node node) {
+        return node.injector().getInstance(ClusterService.class);
+    }
+
+    // pkg-private for testing
+    static Map<String, MetaData.Custom> mergeChangedCustomMetaData(Set<String> changedCustomMetaDataTypeSet,
+                                                                   Function<String, List<MergableCustomMetaData>> customMetaDataByTribeNode) {
+
+        Map<String, MetaData.Custom> changedCustomMetaDataMap = new HashMap<>(changedCustomMetaDataTypeSet.size());
+        for (String customMetaDataType : changedCustomMetaDataTypeSet) {
+            customMetaDataByTribeNode.apply(customMetaDataType).stream()
+                    .reduce((mergableCustomMD, mergableCustomMD2) ->
+                            ((MergableCustomMetaData) mergableCustomMD.merge((MetaData.Custom) mergableCustomMD2)))
+                    .ifPresent(mergedCustomMetaData ->
+                            changedCustomMetaDataMap.put(customMetaDataType, ((MetaData.Custom) mergedCustomMetaData)));
+        }
+        return changedCustomMetaDataMap;
+    }
 }
diff --git a/core/src/test/java/org/elasticsearch/ExceptionSerializationTests.java b/core/src/test/java/org/elasticsearch/ExceptionSerializationTests.java
index ac42bb5cdce..603272126b4 100644
--- a/core/src/test/java/org/elasticsearch/ExceptionSerializationTests.java
+++ b/core/src/test/java/org/elasticsearch/ExceptionSerializationTests.java
@@ -49,6 +49,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.common.xcontent.XContentLocation;
 import org.elasticsearch.discovery.DiscoverySettings;
+import org.elasticsearch.env.ShardLockObtainFailedException;
 import org.elasticsearch.index.AlreadyExpiredException;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.engine.RecoveryEngineException;
@@ -107,6 +108,7 @@ import static java.util.Collections.emptyMap;
 import static java.util.Collections.emptySet;
 import static java.util.Collections.singleton;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.hamcrest.Matchers.instanceOf;
 
 public class ExceptionSerializationTests extends ESTestCase {
 
@@ -160,10 +162,10 @@ public class ExceptionSerializationTests extends ESTestCase {
                 if (isEsException(clazz) == false) {
                     return;
                 }
-                if (ElasticsearchException.isRegistered(clazz.asSubclass(Throwable.class)) == false
+                if (ElasticsearchException.isRegistered(clazz.asSubclass(Throwable.class), Version.CURRENT) == false
                         && ElasticsearchException.class.equals(clazz.getEnclosingClass()) == false) {
                     notRegistered.add(clazz);
-                } else if (ElasticsearchException.isRegistered(clazz.asSubclass(Throwable.class))) {
+                } else if (ElasticsearchException.isRegistered(clazz.asSubclass(Throwable.class), Version.CURRENT)) {
                     registered.add(clazz);
                     try {
                         if (clazz.getMethod("writeTo", StreamOutput.class) != null) {
@@ -218,10 +220,17 @@ public class ExceptionSerializationTests extends ESTestCase {
     }
 
     private <T extends Exception> T serialize(T exception) throws IOException {
-        ElasticsearchAssertions.assertVersionSerializable(VersionUtils.randomVersion(random()), exception);
+       return serialize(exception, VersionUtils.randomVersion(random()));
+    }
+
+    private <T extends Exception> T serialize(T exception, Version version) throws IOException {
+        ElasticsearchAssertions.assertVersionSerializable(version, exception);
         BytesStreamOutput out = new BytesStreamOutput();
+        out.setVersion(version);
         out.writeException(exception);
+
         StreamInput in = out.bytes().streamInput();
+        in.setVersion(version);
         return in.readException();
     }
 
@@ -769,6 +778,7 @@ public class ExceptionSerializationTests extends ESTestCase {
         ids.put(144, org.elasticsearch.cluster.NotMasterException.class);
         ids.put(145, org.elasticsearch.ElasticsearchStatusException.class);
         ids.put(146, org.elasticsearch.tasks.TaskCancelledException.class);
+        ids.put(147, org.elasticsearch.env.ShardLockObtainFailedException.class);
 
         Map<Class<? extends ElasticsearchException>, Integer> reverse = new HashMap<>();
         for (Map.Entry<Integer, Class<? extends ElasticsearchException>> entry : ids.entrySet()) {
@@ -826,4 +836,28 @@ public class ExceptionSerializationTests extends ESTestCase {
         assertEquals(ex.status(), e.status());
         assertEquals(RestStatus.TOO_MANY_REQUESTS, e.status());
     }
+
+    public void testShardLockObtainFailedException() throws IOException {
+        ShardId shardId = new ShardId("foo", "_na_", 1);
+        ShardLockObtainFailedException orig = new ShardLockObtainFailedException(shardId, "boom");
+        Version version = VersionUtils.randomVersionBetween(random(),
+            Version.V_5_0_0, Version.CURRENT);
+        if (version.before(ElasticsearchException.V_5_1_0_UNRELEASED)) {
+            // remove this once 5_1_0 is released randomVersionBetween asserts that this version is in the constant table..
+            version = ElasticsearchException.V_5_1_0_UNRELEASED;
+        }
+        ShardLockObtainFailedException ex = serialize(orig, version);
+        assertEquals(orig.getMessage(), ex.getMessage());
+        assertEquals(orig.getShardId(), ex.getShardId());
+    }
+
+    public void testBWCShardLockObtainFailedException() throws IOException {
+        ShardId shardId = new ShardId("foo", "_na_", 1);
+        ShardLockObtainFailedException orig = new ShardLockObtainFailedException(shardId, "boom");
+        Exception ex = serialize((Exception)orig, Version.V_5_0_0);
+        assertThat(ex, instanceOf(NotSerializableExceptionWrapper.class));
+        assertEquals("shard_lock_obtain_failed_exception: [foo][1]: boom", ex.getMessage());
+    }
+
+
 }
diff --git a/core/src/test/java/org/elasticsearch/VersionTests.java b/core/src/test/java/org/elasticsearch/VersionTests.java
index 9499b79432c..1e87f7eeb31 100644
--- a/core/src/test/java/org/elasticsearch/VersionTests.java
+++ b/core/src/test/java/org/elasticsearch/VersionTests.java
@@ -284,6 +284,7 @@ public class VersionTests extends ESTestCase {
         assertUnknownVersion(OsStats.V_5_1_0); // once we released 5.1.0 and it's added to Version.java we need to remove this constant
         assertUnknownVersion(QueryStringQueryBuilder.V_5_1_0_UNRELEASED);
         assertUnknownVersion(SimpleQueryStringBuilder.V_5_1_0_UNRELEASED);
+        assertUnknownVersion(ElasticsearchException.V_5_1_0_UNRELEASED);
         // once we released 5.0.0 and it's added to Version.java we need to remove this constant
         assertUnknownVersion(Script.V_5_1_0_UNRELEASED);
         // once we released 5.0.0 and it's added to Version.java we need to remove this constant
diff --git a/core/src/test/java/org/elasticsearch/cluster/ClusterChangedEventTests.java b/core/src/test/java/org/elasticsearch/cluster/ClusterChangedEventTests.java
index 939954c4560..63d34f683de 100644
--- a/core/src/test/java/org/elasticsearch/cluster/ClusterChangedEventTests.java
+++ b/core/src/test/java/org/elasticsearch/cluster/ClusterChangedEventTests.java
@@ -20,6 +20,7 @@
 package org.elasticsearch.cluster;
 
 import com.carrotsearch.hppc.cursors.ObjectCursor;
+import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
 import org.elasticsearch.Version;
 import org.elasticsearch.cluster.block.ClusterBlocks;
 import org.elasticsearch.cluster.metadata.IndexGraveyard;
@@ -33,6 +34,7 @@ import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.gateway.GatewayService;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.test.ESTestCase;
+import org.elasticsearch.test.TestCustomMetaData;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -222,6 +224,128 @@ public class ClusterChangedEventTests extends ESTestCase {
         assertTrue("index routing table should not be the same object", event.indexRoutingTableChanged(initialIndices.get(0).getName()));
     }
 
+    /**
+     * Test custom metadata change checks
+     */
+    public void testChangedCustomMetaDataSet() {
+        final int numNodesInCluster = 3;
+
+        final ClusterState originalState = createState(numNodesInCluster, randomBoolean(), initialIndices);
+        CustomMetaData1 customMetaData1 = new CustomMetaData1("data");
+        final ClusterState stateWithCustomMetaData = nextState(originalState, Collections.singletonList(customMetaData1));
+
+        // no custom metadata present in any state
+        ClusterState nextState = ClusterState.builder(originalState).build();
+        ClusterChangedEvent event = new ClusterChangedEvent("_na_", originalState, nextState);
+        assertTrue(event.changedCustomMetaDataSet().isEmpty());
+
+        // next state has new custom metadata
+        nextState = nextState(originalState, Collections.singletonList(customMetaData1));
+        event = new ClusterChangedEvent("_na_", originalState, nextState);
+        Set<String> changedCustomMetaDataTypeSet = event.changedCustomMetaDataSet();
+        assertTrue(changedCustomMetaDataTypeSet.size() == 1);
+        assertTrue(changedCustomMetaDataTypeSet.contains(customMetaData1.type()));
+
+        // next state has same custom metadata
+        nextState = nextState(originalState, Collections.singletonList(customMetaData1));
+        event = new ClusterChangedEvent("_na_", stateWithCustomMetaData, nextState);
+        changedCustomMetaDataTypeSet = event.changedCustomMetaDataSet();
+        assertTrue(changedCustomMetaDataTypeSet.isEmpty());
+
+        // next state has equivalent custom metadata
+        nextState = nextState(originalState, Collections.singletonList(new CustomMetaData1("data")));
+        event = new ClusterChangedEvent("_na_", stateWithCustomMetaData, nextState);
+        changedCustomMetaDataTypeSet = event.changedCustomMetaDataSet();
+        assertTrue(changedCustomMetaDataTypeSet.isEmpty());
+
+        // next state removes custom metadata
+        nextState = originalState;
+        event = new ClusterChangedEvent("_na_", stateWithCustomMetaData, nextState);
+        changedCustomMetaDataTypeSet = event.changedCustomMetaDataSet();
+        assertTrue(changedCustomMetaDataTypeSet.size() == 1);
+        assertTrue(changedCustomMetaDataTypeSet.contains(customMetaData1.type()));
+
+        // next state updates custom metadata
+        nextState = nextState(stateWithCustomMetaData, Collections.singletonList(new CustomMetaData1("data1")));
+        event = new ClusterChangedEvent("_na_", stateWithCustomMetaData, nextState);
+        changedCustomMetaDataTypeSet = event.changedCustomMetaDataSet();
+        assertTrue(changedCustomMetaDataTypeSet.size() == 1);
+        assertTrue(changedCustomMetaDataTypeSet.contains(customMetaData1.type()));
+
+        // next state adds new custom metadata type
+        CustomMetaData2 customMetaData2 = new CustomMetaData2("data2");
+        nextState = nextState(stateWithCustomMetaData, Arrays.asList(customMetaData1, customMetaData2));
+        event = new ClusterChangedEvent("_na_", stateWithCustomMetaData, nextState);
+        changedCustomMetaDataTypeSet = event.changedCustomMetaDataSet();
+        assertTrue(changedCustomMetaDataTypeSet.size() == 1);
+        assertTrue(changedCustomMetaDataTypeSet.contains(customMetaData2.type()));
+
+        // next state adds two custom metadata type
+        nextState = nextState(originalState, Arrays.asList(customMetaData1, customMetaData2));
+        event = new ClusterChangedEvent("_na_", originalState, nextState);
+        changedCustomMetaDataTypeSet = event.changedCustomMetaDataSet();
+        assertTrue(changedCustomMetaDataTypeSet.size() == 2);
+        assertTrue(changedCustomMetaDataTypeSet.contains(customMetaData2.type()));
+        assertTrue(changedCustomMetaDataTypeSet.contains(customMetaData1.type()));
+
+        // next state removes two custom metadata type
+        nextState = originalState;
+        event = new ClusterChangedEvent("_na_",
+                nextState(originalState, Arrays.asList(customMetaData1, customMetaData2)), nextState);
+        changedCustomMetaDataTypeSet = event.changedCustomMetaDataSet();
+        assertTrue(changedCustomMetaDataTypeSet.size() == 2);
+        assertTrue(changedCustomMetaDataTypeSet.contains(customMetaData2.type()));
+        assertTrue(changedCustomMetaDataTypeSet.contains(customMetaData1.type()));
+    }
+
+    private static class CustomMetaData2 extends TestCustomMetaData {
+        static {
+            MetaData.registerPrototype("2", new CustomMetaData2(""));
+        }
+        protected CustomMetaData2(String data) {
+            super(data);
+        }
+
+        @Override
+        protected TestCustomMetaData newTestCustomMetaData(String data) {
+            return new CustomMetaData2(data);
+        }
+
+        @Override
+        public String type() {
+            return "2";
+        }
+
+        @Override
+        public EnumSet<MetaData.XContentContext> context() {
+            return EnumSet.of(MetaData.XContentContext.GATEWAY);
+        }
+    }
+
+    private static class CustomMetaData1 extends TestCustomMetaData {
+        static {
+            MetaData.registerPrototype("1", new CustomMetaData1(""));
+        }
+        protected CustomMetaData1(String data) {
+            super(data);
+        }
+
+        @Override
+        protected TestCustomMetaData newTestCustomMetaData(String data) {
+            return new CustomMetaData1(data);
+        }
+
+        @Override
+        public String type() {
+            return "1";
+        }
+
+        @Override
+        public EnumSet<MetaData.XContentContext> context() {
+            return EnumSet.of(MetaData.XContentContext.GATEWAY);
+        }
+    }
+
     private static ClusterState createSimpleClusterState() {
         return ClusterState.builder(TEST_CLUSTER_NAME).build();
     }
@@ -244,6 +368,22 @@ public class ClusterChangedEventTests extends ESTestCase {
                            .build();
     }
 
+    private static ClusterState nextState(final ClusterState previousState, List<TestCustomMetaData> customMetaDataList) {
+        final ClusterState.Builder builder = ClusterState.builder(previousState);
+        builder.stateUUID(UUIDs.randomBase64UUID());
+        MetaData.Builder metaDataBuilder = new MetaData.Builder(previousState.metaData());
+        for (ObjectObjectCursor<String, MetaData.Custom> customMetaData : previousState.metaData().customs()) {
+            if (customMetaData.value instanceof TestCustomMetaData) {
+                metaDataBuilder.removeCustom(customMetaData.key);
+            }
+        }
+        for (TestCustomMetaData testCustomMetaData : customMetaDataList) {
+            metaDataBuilder.putCustom(testCustomMetaData.type(), testCustomMetaData);
+        }
+        builder.metaData(metaDataBuilder);
+        return builder.build();
+    }
+
     // Create a modified cluster state from another one, but with some number of indices added and deleted.
     private static ClusterState nextState(final ClusterState previousState, final boolean changeClusterUUID,
                                           final List<Index> addedIndices, final List<Index> deletedIndices, final int numNodesToRemove) {
diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardAllocationDecisionTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecisionTests.java
similarity index 59%
rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardAllocationDecisionTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecisionTests.java
index d8e4570c04b..5648cb38117 100644
--- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardAllocationDecisionTests.java
+++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecisionTests.java
@@ -20,7 +20,6 @@
 package org.elasticsearch.cluster.routing.allocation;
 
 import org.elasticsearch.cluster.routing.UnassignedInfo.AllocationStatus;
-import org.elasticsearch.cluster.routing.allocation.ShardAllocationDecision.WeightedDecision;
 import org.elasticsearch.cluster.routing.allocation.decider.Decision;
 import org.elasticsearch.test.ESTestCase;
 
@@ -32,27 +31,27 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
- * Unit tests for the {@link ShardAllocationDecision} class.
+ * Unit tests for the {@link AllocateUnassignedDecision} class.
  */
-public class ShardAllocationDecisionTests extends ESTestCase {
+public class AllocateUnassignedDecisionTests extends ESTestCase {
 
     public void testDecisionNotTaken() {
-        ShardAllocationDecision shardAllocationDecision = ShardAllocationDecision.DECISION_NOT_TAKEN;
-        assertFalse(shardAllocationDecision.isDecisionTaken());
-        assertNull(shardAllocationDecision.getFinalDecisionType());
-        assertNull(shardAllocationDecision.getAllocationStatus());
-        assertNull(shardAllocationDecision.getAllocationId());
-        assertNull(shardAllocationDecision.getAssignedNodeId());
-        assertNull(shardAllocationDecision.getFinalExplanation());
-        assertNull(shardAllocationDecision.getNodeDecisions());
-        expectThrows(IllegalArgumentException.class, () -> shardAllocationDecision.getFinalDecisionSafe());
+        AllocateUnassignedDecision allocateUnassignedDecision = AllocateUnassignedDecision.NOT_TAKEN;
+        assertFalse(allocateUnassignedDecision.isDecisionTaken());
+        assertNull(allocateUnassignedDecision.getFinalDecisionType());
+        assertNull(allocateUnassignedDecision.getAllocationStatus());
+        assertNull(allocateUnassignedDecision.getAllocationId());
+        assertNull(allocateUnassignedDecision.getAssignedNodeId());
+        assertNull(allocateUnassignedDecision.getFinalExplanation());
+        assertNull(allocateUnassignedDecision.getNodeDecisions());
+        expectThrows(IllegalArgumentException.class, () -> allocateUnassignedDecision.getFinalDecisionSafe());
     }
 
     public void testNoDecision() {
         final AllocationStatus allocationStatus = randomFrom(
             AllocationStatus.DELAYED_ALLOCATION, AllocationStatus.NO_VALID_SHARD_COPY, AllocationStatus.FETCHING_SHARD_DATA
         );
-        ShardAllocationDecision noDecision = ShardAllocationDecision.no(allocationStatus, "something is wrong");
+        AllocateUnassignedDecision noDecision = AllocateUnassignedDecision.no(allocationStatus, "something is wrong");
         assertTrue(noDecision.isDecisionTaken());
         assertEquals(Decision.Type.NO, noDecision.getFinalDecisionType());
         assertEquals(allocationStatus, noDecision.getAllocationStatus());
@@ -61,10 +60,10 @@ public class ShardAllocationDecisionTests extends ESTestCase {
         assertNull(noDecision.getAssignedNodeId());
         assertNull(noDecision.getAllocationId());
 
-        Map<String, ShardAllocationDecision.WeightedDecision> nodeDecisions = new HashMap<>();
-        nodeDecisions.put("node1", new ShardAllocationDecision.WeightedDecision(Decision.NO));
-        nodeDecisions.put("node2", new ShardAllocationDecision.WeightedDecision(Decision.NO));
-        noDecision = ShardAllocationDecision.no(AllocationStatus.DECIDERS_NO, "something is wrong",
+        Map<String, NodeAllocationResult> nodeDecisions = new HashMap<>();
+        nodeDecisions.put("node1", new NodeAllocationResult(Decision.NO));
+        nodeDecisions.put("node2", new NodeAllocationResult(Decision.NO));
+        noDecision = AllocateUnassignedDecision.no(AllocationStatus.DECIDERS_NO, "something is wrong",
             nodeDecisions.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().getDecision()))
         );
         assertTrue(noDecision.isDecisionTaken());
@@ -76,14 +75,14 @@ public class ShardAllocationDecisionTests extends ESTestCase {
         assertNull(noDecision.getAllocationId());
 
         // test bad values
-        expectThrows(NullPointerException.class, () -> ShardAllocationDecision.no((AllocationStatus)null, "a"));
+        expectThrows(NullPointerException.class, () -> AllocateUnassignedDecision.no((AllocationStatus)null, "a"));
     }
 
     public void testThrottleDecision() {
-        Map<String, WeightedDecision> nodeDecisions = new HashMap<>();
-        nodeDecisions.put("node1", new ShardAllocationDecision.WeightedDecision(Decision.NO));
-        nodeDecisions.put("node2", new ShardAllocationDecision.WeightedDecision(Decision.THROTTLE));
-        ShardAllocationDecision throttleDecision = ShardAllocationDecision.throttle("too much happening",
+        Map<String, NodeAllocationResult> nodeDecisions = new HashMap<>();
+        nodeDecisions.put("node1", new NodeAllocationResult(Decision.NO));
+        nodeDecisions.put("node2", new NodeAllocationResult(Decision.THROTTLE));
+        AllocateUnassignedDecision throttleDecision = AllocateUnassignedDecision.throttle("too much happening",
             nodeDecisions.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().getDecision()))
         );
         assertTrue(throttleDecision.isDecisionTaken());
@@ -96,11 +95,11 @@ public class ShardAllocationDecisionTests extends ESTestCase {
     }
 
     public void testYesDecision() {
-        Map<String, ShardAllocationDecision.WeightedDecision> nodeDecisions = new HashMap<>();
-        nodeDecisions.put("node1", new ShardAllocationDecision.WeightedDecision(Decision.YES));
-        nodeDecisions.put("node2", new ShardAllocationDecision.WeightedDecision(Decision.NO));
+        Map<String, NodeAllocationResult> nodeDecisions = new HashMap<>();
+        nodeDecisions.put("node1", new NodeAllocationResult(Decision.YES));
+        nodeDecisions.put("node2", new NodeAllocationResult(Decision.NO));
         String allocId = randomBoolean() ? "allocId" : null;
-        ShardAllocationDecision yesDecision = ShardAllocationDecision.yes(
+        AllocateUnassignedDecision yesDecision = AllocateUnassignedDecision.yes(
             "node1", "node was very kind", allocId, nodeDecisions.entrySet().stream().collect(
                 Collectors.toMap(Map.Entry::getKey, e -> e.getValue().getDecision())
             )
@@ -119,27 +118,27 @@ public class ShardAllocationDecisionTests extends ESTestCase {
             AllocationStatus.NO_VALID_SHARD_COPY, AllocationStatus.FETCHING_SHARD_DATA, AllocationStatus.DELAYED_ALLOCATION);
         for (AllocationStatus allocationStatus : cachableStatuses) {
             if (allocationStatus == AllocationStatus.DECIDERS_THROTTLED) {
-                ShardAllocationDecision cached = ShardAllocationDecision.throttle(null, null);
-                ShardAllocationDecision another = ShardAllocationDecision.throttle(null, null);
+                AllocateUnassignedDecision cached = AllocateUnassignedDecision.throttle(null, null);
+                AllocateUnassignedDecision another = AllocateUnassignedDecision.throttle(null, null);
                 assertSame(cached, another);
-                ShardAllocationDecision notCached = ShardAllocationDecision.throttle("abc", null);
-                another = ShardAllocationDecision.throttle("abc", null);
+                AllocateUnassignedDecision notCached = AllocateUnassignedDecision.throttle("abc", null);
+                another = AllocateUnassignedDecision.throttle("abc", null);
                 assertNotSame(notCached, another);
             } else {
-                ShardAllocationDecision cached = ShardAllocationDecision.no(allocationStatus, null);
-                ShardAllocationDecision another = ShardAllocationDecision.no(allocationStatus, null);
+                AllocateUnassignedDecision cached = AllocateUnassignedDecision.no(allocationStatus, null);
+                AllocateUnassignedDecision another = AllocateUnassignedDecision.no(allocationStatus, null);
                 assertSame(cached, another);
-                ShardAllocationDecision notCached = ShardAllocationDecision.no(allocationStatus, "abc");
-                another = ShardAllocationDecision.no(allocationStatus, "abc");
+                AllocateUnassignedDecision notCached = AllocateUnassignedDecision.no(allocationStatus, "abc");
+                another = AllocateUnassignedDecision.no(allocationStatus, "abc");
                 assertNotSame(notCached, another);
             }
         }
 
         // yes decisions are not precomputed and cached
         Map<String, Decision> dummyMap = Collections.emptyMap();
-        ShardAllocationDecision first = ShardAllocationDecision.yes("node1", "abc", "alloc1", dummyMap);
-        ShardAllocationDecision second = ShardAllocationDecision.yes("node1", "abc", "alloc1", dummyMap);
-        // same fields for the ShardAllocationDecision, but should be different instances
+        AllocateUnassignedDecision first = AllocateUnassignedDecision.yes("node1", "abc", "alloc1", dummyMap);
+        AllocateUnassignedDecision second = AllocateUnassignedDecision.yes("node1", "abc", "alloc1", dummyMap);
+        // same fields for the AllocateUnassignedDecision, but should be different instances
         assertNotSame(first, second);
     }
 
diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalancedSingleShardTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalancedSingleShardTests.java
index 1ae1620520e..d06fa3dc330 100644
--- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalancedSingleShardTests.java
+++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalancedSingleShardTests.java
@@ -31,8 +31,6 @@ import org.elasticsearch.cluster.routing.ShardRouting;
 import org.elasticsearch.cluster.routing.ShardRoutingState;
 import org.elasticsearch.cluster.routing.allocation.allocator.BalancedShardsAllocator;
 import org.elasticsearch.cluster.routing.allocation.allocator.BalancedShardsAllocator.Balancer;
-import org.elasticsearch.cluster.routing.allocation.allocator.BalancedShardsAllocator.NodeRebalanceDecision;
-import org.elasticsearch.cluster.routing.allocation.allocator.BalancedShardsAllocator.RebalanceDecision;
 import org.elasticsearch.cluster.routing.allocation.decider.AllocationDecider;
 import org.elasticsearch.cluster.routing.allocation.decider.AllocationDeciders;
 import org.elasticsearch.cluster.routing.allocation.decider.Decision;
@@ -222,8 +220,8 @@ public class BalancedSingleShardTests extends ESAllocationTestCase {
         assertEquals(shardToRebalance.relocatingNodeId(), rebalanceDecision.getAssignedNodeId());
         // make sure all excluded nodes returned a NO decision
         for (String exludedNode : excludeNodes) {
-            NodeRebalanceDecision nodeRebalanceDecision = rebalanceDecision.getNodeDecisions().get(exludedNode);
-            assertEquals(Type.NO, nodeRebalanceDecision.getCanAllocateDecision().type());
+            NodeRebalanceResult nodeRebalanceResult = rebalanceDecision.getNodeDecisions().get(exludedNode);
+            assertEquals(Type.NO, nodeRebalanceResult.getCanAllocateDecision().type());
         }
     }
 
diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/MoveDecisionTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/MoveDecisionTests.java
index 783fe690365..797976a7125 100644
--- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/MoveDecisionTests.java
+++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/MoveDecisionTests.java
@@ -19,8 +19,6 @@
 
 package org.elasticsearch.cluster.routing.allocation;
 
-import org.elasticsearch.cluster.routing.allocation.ShardAllocationDecision.WeightedDecision;
-import org.elasticsearch.cluster.routing.allocation.allocator.BalancedShardsAllocator.MoveDecision;
 import org.elasticsearch.cluster.routing.allocation.decider.Decision;
 import org.elasticsearch.cluster.routing.allocation.decider.Decision.Type;
 import org.elasticsearch.test.ESTestCase;
@@ -79,9 +77,9 @@ public class MoveDecisionTests extends ESTestCase {
     }
 
     public void testDecisionWithExplain() {
-        Map<String, WeightedDecision> nodeDecisions = new HashMap<>();
-        nodeDecisions.put("node1", new WeightedDecision(randomFrom(Decision.NO, Decision.THROTTLE, Decision.YES), randomFloat()));
-        nodeDecisions.put("node2", new WeightedDecision(randomFrom(Decision.NO, Decision.THROTTLE, Decision.YES), randomFloat()));
+        Map<String, NodeAllocationResult> nodeDecisions = new HashMap<>();
+        nodeDecisions.put("node1", new NodeAllocationResult(randomFrom(Decision.NO, Decision.THROTTLE, Decision.YES), randomFloat()));
+        nodeDecisions.put("node2", new NodeAllocationResult(randomFrom(Decision.NO, Decision.THROTTLE, Decision.YES), randomFloat()));
         MoveDecision decision = MoveDecision.decision(Decision.NO, Type.NO, true, "node1", null, nodeDecisions);
         assertNotNull(decision.getFinalDecisionType());
         assertNotNull(decision.getFinalExplanation());
diff --git a/core/src/test/java/org/elasticsearch/cluster/service/ClusterServiceTests.java b/core/src/test/java/org/elasticsearch/cluster/service/ClusterServiceTests.java
index 026d3a16185..a5d4790f742 100644
--- a/core/src/test/java/org/elasticsearch/cluster/service/ClusterServiceTests.java
+++ b/core/src/test/java/org/elasticsearch/cluster/service/ClusterServiceTests.java
@@ -150,6 +150,7 @@ public class ClusterServiceTests extends ESTestCase {
 
     public void testTimedOutUpdateTaskCleanedUp() throws Exception {
         final CountDownLatch block = new CountDownLatch(1);
+        final CountDownLatch blockCompleted = new CountDownLatch(1);
         clusterService.submitStateUpdateTask("block-task", new ClusterStateUpdateTask() {
             @Override
             public ClusterState execute(ClusterState currentState) {
@@ -158,6 +159,7 @@ public class ClusterServiceTests extends ESTestCase {
                 } catch (InterruptedException e) {
                     throw new RuntimeException(e);
                 }
+                blockCompleted.countDown();
                 return currentState;
             }
 
@@ -187,6 +189,7 @@ public class ClusterServiceTests extends ESTestCase {
         });
         block.countDown();
         block2.await();
+        blockCompleted.await();
         synchronized (clusterService.updateTasksPerExecutor) {
             assertTrue("expected empty map but was " + clusterService.updateTasksPerExecutor,
                 clusterService.updateTasksPerExecutor.isEmpty());
diff --git a/core/src/test/java/org/elasticsearch/common/NumbersTests.java b/core/src/test/java/org/elasticsearch/common/NumbersTests.java
new file mode 100644
index 00000000000..e5563993ad5
--- /dev/null
+++ b/core/src/test/java/org/elasticsearch/common/NumbersTests.java
@@ -0,0 +1,146 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.common;
+
+import org.elasticsearch.test.ESTestCase;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class NumbersTests extends ESTestCase {
+
+    public void testToLongExact() {
+        assertEquals(3L, Numbers.toLongExact(Long.valueOf(3L)));
+        assertEquals(3L, Numbers.toLongExact(Integer.valueOf(3)));
+        assertEquals(3L, Numbers.toLongExact(Short.valueOf((short) 3)));
+        assertEquals(3L, Numbers.toLongExact(Byte.valueOf((byte) 3)));
+        assertEquals(3L, Numbers.toLongExact(3d));
+        assertEquals(3L, Numbers.toLongExact(3f));
+        assertEquals(3L, Numbers.toLongExact(BigInteger.valueOf(3L)));
+        assertEquals(3L, Numbers.toLongExact(BigDecimal.valueOf(3L)));
+
+        IllegalArgumentException e = expectThrows(IllegalArgumentException.class,
+                () -> Numbers.toLongExact(3.1d));
+        assertEquals("3.1 is not an integer value", e.getMessage());
+        e = expectThrows(IllegalArgumentException.class,
+                () -> Numbers.toLongExact(Double.NaN));
+        assertEquals("NaN is not an integer value", e.getMessage());
+        e = expectThrows(IllegalArgumentException.class,
+                () -> Numbers.toLongExact(Double.POSITIVE_INFINITY));
+        assertEquals("Infinity is not an integer value", e.getMessage());
+        e = expectThrows(IllegalArgumentException.class,
+                () -> Numbers.toLongExact(3.1f));
+        assertEquals("3.1 is not an integer value", e.getMessage());
+        e = expectThrows(IllegalArgumentException.class,
+                () -> Numbers.toLongExact(new AtomicInteger(3))); // not supported
+        assertEquals("Cannot check whether [3] of class [java.util.concurrent.atomic.AtomicInteger] is actually a long", e.getMessage());
+    }
+
+    public void testToIntExact() {
+        assertEquals(3L, Numbers.toIntExact(Long.valueOf(3L)));
+        assertEquals(3L, Numbers.toIntExact(Integer.valueOf(3)));
+        assertEquals(3L, Numbers.toIntExact(Short.valueOf((short) 3)));
+        assertEquals(3L, Numbers.toIntExact(Byte.valueOf((byte) 3)));
+        assertEquals(3L, Numbers.toIntExact(3d));
+        assertEquals(3L, Numbers.toIntExact(3f));
+        assertEquals(3L, Numbers.toIntExact(BigInteger.valueOf(3L)));
+        assertEquals(3L, Numbers.toIntExact(BigDecimal.valueOf(3L)));
+
+        IllegalArgumentException e = expectThrows(IllegalArgumentException.class,
+                () -> Numbers.toIntExact(3.1d));
+        assertEquals("3.1 is not an integer value", e.getMessage());
+        e = expectThrows(IllegalArgumentException.class,
+                () -> Numbers.toLongExact(Double.NaN));
+        assertEquals("NaN is not an integer value", e.getMessage());
+        e = expectThrows(IllegalArgumentException.class,
+                () -> Numbers.toLongExact(Double.POSITIVE_INFINITY));
+        assertEquals("Infinity is not an integer value", e.getMessage());
+        e = expectThrows(IllegalArgumentException.class,
+                () -> Numbers.toIntExact(3.1f));
+        assertEquals("3.1 is not an integer value", e.getMessage());
+        ArithmeticException ae = expectThrows(ArithmeticException.class,
+                () -> Numbers.toIntExact(1L << 40));
+        assertEquals("integer overflow", ae.getMessage());
+        e = expectThrows(IllegalArgumentException.class,
+                () -> Numbers.toIntExact(new AtomicInteger(3))); // not supported
+        assertEquals("Cannot check whether [3] of class [java.util.concurrent.atomic.AtomicInteger] is actually a long", e.getMessage());
+    }
+
+    public void testToShortExact() {
+        assertEquals(3L, Numbers.toShortExact(Long.valueOf(3L)));
+        assertEquals(3L, Numbers.toShortExact(Integer.valueOf(3)));
+        assertEquals(3L, Numbers.toShortExact(Short.valueOf((short) 3)));
+        assertEquals(3L, Numbers.toShortExact(Byte.valueOf((byte) 3)));
+        assertEquals(3L, Numbers.toShortExact(3d));
+        assertEquals(3L, Numbers.toShortExact(3f));
+        assertEquals(3L, Numbers.toShortExact(BigInteger.valueOf(3L)));
+        assertEquals(3L, Numbers.toShortExact(BigDecimal.valueOf(3L)));
+
+        IllegalArgumentException e = expectThrows(IllegalArgumentException.class,
+                () -> Numbers.toShortExact(3.1d));
+        assertEquals("3.1 is not an integer value", e.getMessage());
+        e = expectThrows(IllegalArgumentException.class,
+                () -> Numbers.toLongExact(Double.NaN));
+        assertEquals("NaN is not an integer value", e.getMessage());
+        e = expectThrows(IllegalArgumentException.class,
+                () -> Numbers.toLongExact(Double.POSITIVE_INFINITY));
+        assertEquals("Infinity is not an integer value", e.getMessage());
+        e = expectThrows(IllegalArgumentException.class,
+                () -> Numbers.toShortExact(3.1f));
+        assertEquals("3.1 is not an integer value", e.getMessage());
+        ArithmeticException ae = expectThrows(ArithmeticException.class,
+                () -> Numbers.toShortExact(100000));
+        assertEquals("short overflow: " + 100000, ae.getMessage());
+        e = expectThrows(IllegalArgumentException.class,
+                () -> Numbers.toShortExact(new AtomicInteger(3))); // not supported
+        assertEquals("Cannot check whether [3] of class [java.util.concurrent.atomic.AtomicInteger] is actually a long", e.getMessage());
+    }
+
+    public void testToByteExact() {
+        assertEquals(3L, Numbers.toByteExact(Long.valueOf(3L)));
+        assertEquals(3L, Numbers.toByteExact(Integer.valueOf(3)));
+        assertEquals(3L, Numbers.toByteExact(Short.valueOf((short) 3)));
+        assertEquals(3L, Numbers.toByteExact(Byte.valueOf((byte) 3)));
+        assertEquals(3L, Numbers.toByteExact(3d));
+        assertEquals(3L, Numbers.toByteExact(3f));
+        assertEquals(3L, Numbers.toByteExact(BigInteger.valueOf(3L)));
+        assertEquals(3L, Numbers.toByteExact(BigDecimal.valueOf(3L)));
+
+        IllegalArgumentException e = expectThrows(IllegalArgumentException.class,
+                () -> Numbers.toByteExact(3.1d));
+        assertEquals("3.1 is not an integer value", e.getMessage());
+        e = expectThrows(IllegalArgumentException.class,
+                () -> Numbers.toLongExact(Double.NaN));
+        assertEquals("NaN is not an integer value", e.getMessage());
+        e = expectThrows(IllegalArgumentException.class,
+                () -> Numbers.toLongExact(Double.POSITIVE_INFINITY));
+        assertEquals("Infinity is not an integer value", e.getMessage());
+        e = expectThrows(IllegalArgumentException.class,
+                () -> Numbers.toByteExact(3.1f));
+        assertEquals("3.1 is not an integer value", e.getMessage());
+        ArithmeticException ae = expectThrows(ArithmeticException.class,
+                () -> Numbers.toByteExact(300));
+        assertEquals("byte overflow: " + 300, ae.getMessage());
+        e = expectThrows(IllegalArgumentException.class,
+                () -> Numbers.toByteExact(new AtomicInteger(3))); // not supported
+        assertEquals("Cannot check whether [3] of class [java.util.concurrent.atomic.AtomicInteger] is actually a long", e.getMessage());
+    }
+}
diff --git a/core/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java b/core/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java
index f51a85b2f9a..866a02476e7 100644
--- a/core/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java
+++ b/core/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java
@@ -19,7 +19,9 @@
 
 package org.elasticsearch.common.io.stream;
 
+import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.Constants;
+import org.apache.lucene.util.UnicodeUtil;
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.geo.GeoPoint;
@@ -28,6 +30,7 @@ import org.elasticsearch.common.util.BigArrays;
 import org.elasticsearch.test.ESTestCase;
 import org.joda.time.DateTimeZone;
 
+import java.io.EOFException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -657,4 +660,106 @@ public class BytesStreamsTests extends ESTestCase {
         IntStream.range(0, size).forEach(i -> map.put(keyGenerator.get(), valueGenerator.get()));
         return map;
     }
+
+    public void testWriteRandomStrings() throws IOException {
+        final int iters = scaledRandomIntBetween(5, 20);
+        for (int iter = 0; iter < iters; iter++) {
+            List<String> strings = new ArrayList<>();
+            int numStrings = randomIntBetween(100, 1000);
+            BytesStreamOutput output = new BytesStreamOutput(0);
+            for (int i = 0; i < numStrings; i++) {
+                String s = randomRealisticUnicodeOfLengthBetween(0, 2048);
+                strings.add(s);
+                output.writeString(s);
+            }
+
+            try (StreamInput streamInput = output.bytes().streamInput()) {
+                for (int i = 0; i < numStrings; i++) {
+                    String s = streamInput.readString();
+                    assertEquals(strings.get(i), s);
+                }
+            }
+        }
+    }
+
+    /*
+     * tests the extreme case where characters use more than 2 bytes
+     */
+    public void testWriteLargeSurrogateOnlyString() throws IOException {
+        String deseretLetter = "\uD801\uDC00";
+        assertEquals(2, deseretLetter.length());
+        String largeString = IntStream.range(0, 2048).mapToObj(s -> deseretLetter).collect(Collectors.joining("")).trim();
+        assertEquals("expands to 4 bytes", 4, new BytesRef(deseretLetter).length);
+        try (BytesStreamOutput output = new BytesStreamOutput(0)) {
+            output.writeString(largeString);
+            try (StreamInput streamInput = output.bytes().streamInput()) {
+                assertEquals(largeString, streamInput.readString());
+            }
+        }
+    }
+
+    public void testReadTooLargeArraySize() throws IOException {
+        try (BytesStreamOutput output = new BytesStreamOutput(0)) {
+            output.writeVInt(10);
+            for (int i = 0; i < 10; i ++) {
+                output.writeInt(i);
+            }
+
+            output.writeVInt(Integer.MAX_VALUE);
+            for (int i = 0; i < 10; i ++) {
+                output.writeInt(i);
+            }
+            try (StreamInput streamInput = output.bytes().streamInput()) {
+                int[] ints = streamInput.readIntArray();
+                for (int i = 0; i < 10; i ++) {
+                    assertEquals(i, ints[i]);
+                }
+                expectThrows(IllegalStateException.class, () -> streamInput.readIntArray());
+            }
+        }
+    }
+
+    public void testReadCorruptedArraySize() throws IOException {
+        try (BytesStreamOutput output = new BytesStreamOutput(0)) {
+            output.writeVInt(10);
+            for (int i = 0; i < 10; i ++) {
+                output.writeInt(i);
+            }
+
+            output.writeVInt(100);
+            for (int i = 0; i < 10; i ++) {
+                output.writeInt(i);
+            }
+            try (StreamInput streamInput = output.bytes().streamInput()) {
+                int[] ints = streamInput.readIntArray();
+                for (int i = 0; i < 10; i ++) {
+                    assertEquals(i, ints[i]);
+                }
+                EOFException eofException = expectThrows(EOFException.class, () -> streamInput.readIntArray());
+                assertEquals("tried to read: 100 bytes but only 40 remaining", eofException.getMessage());
+            }
+        }
+    }
+
+    public void testReadNegativeArraySize() throws IOException {
+        try (BytesStreamOutput output = new BytesStreamOutput(0)) {
+            output.writeVInt(10);
+            for (int i = 0; i < 10; i ++) {
+                output.writeInt(i);
+            }
+
+            output.writeVInt(Integer.MIN_VALUE);
+            for (int i = 0; i < 10; i ++) {
+                output.writeInt(i);
+            }
+            try (StreamInput streamInput = output.bytes().streamInput()) {
+                int[] ints = streamInput.readIntArray();
+                for (int i = 0; i < 10; i ++) {
+                    assertEquals(i, ints[i]);
+                }
+                NegativeArraySizeException exception = expectThrows(NegativeArraySizeException.class, () -> streamInput.readIntArray());
+                assertEquals("array size must be positive but was: -2147483648", exception.getMessage());
+            }
+        }
+    }
 }
diff --git a/core/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java b/core/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java
index 635c00c1860..99126dcccd4 100644
--- a/core/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java
+++ b/core/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java
@@ -45,6 +45,59 @@ import static org.hamcrest.CoreMatchers.equalTo;
 
 public class ScopedSettingsTests extends ESTestCase {
 
+    public void testResetSetting() {
+        Setting<Integer> dynamicSetting = Setting.intSetting("some.dyn.setting", 1, Property.Dynamic, Property.NodeScope);
+        Setting<Integer> staticSetting = Setting.intSetting("some.static.setting", 1, Property.NodeScope);
+        Settings currentSettings = Settings.builder().put("some.dyn.setting", 5).put("some.static.setting", 6).put("archived.foo.bar", 9)
+            .build();
+        ClusterSettings service = new ClusterSettings(currentSettings
+            , new HashSet<>(Arrays.asList(dynamicSetting, staticSetting)));
+
+        expectThrows(IllegalArgumentException.class, () ->
+        service.updateDynamicSettings(Settings.builder().put("some.dyn.setting", 8).putNull("some.static.setting").build(),
+            Settings.builder().put(currentSettings), Settings.builder(), "node"));
+
+        Settings.Builder target = Settings.builder().put(currentSettings);
+        Settings.Builder update = Settings.builder();
+        assertTrue(service.updateDynamicSettings(Settings.builder().put("some.dyn.setting", 8).build(),
+            target, update, "node"));
+        assertEquals(8, dynamicSetting.get(target.build()).intValue());
+        assertEquals(6, staticSetting.get(target.build()).intValue());
+        assertEquals(9, target.build().getAsInt("archived.foo.bar", null).intValue());
+
+        target = Settings.builder().put(currentSettings);
+        update = Settings.builder();
+        assertTrue(service.updateDynamicSettings(Settings.builder().putNull("some.dyn.setting").build(),
+            target, update, "node"));
+        assertEquals(1, dynamicSetting.get(target.build()).intValue());
+        assertEquals(6, staticSetting.get(target.build()).intValue());
+        assertEquals(9, target.build().getAsInt("archived.foo.bar", null).intValue());
+
+        target = Settings.builder().put(currentSettings);
+        update = Settings.builder();
+        assertTrue(service.updateDynamicSettings(Settings.builder().putNull("archived.foo.bar").build(),
+            target, update, "node"));
+        assertEquals(5, dynamicSetting.get(target.build()).intValue());
+        assertEquals(6, staticSetting.get(target.build()).intValue());
+        assertNull(target.build().getAsInt("archived.foo.bar", null));
+
+        target = Settings.builder().put(currentSettings);
+        update = Settings.builder();
+        assertTrue(service.updateDynamicSettings(Settings.builder().putNull("some.*").build(),
+            target, update, "node"));
+        assertEquals(1, dynamicSetting.get(target.build()).intValue());
+        assertEquals(6, staticSetting.get(target.build()).intValue());
+        assertEquals(9, target.build().getAsInt("archived.foo.bar", null).intValue());
+
+        target = Settings.builder().put(currentSettings);
+        update = Settings.builder();
+        assertTrue(service.updateDynamicSettings(Settings.builder().putNull("*").build(),
+            target, update, "node"));
+        assertEquals(1, dynamicSetting.get(target.build()).intValue());
+        assertEquals(6, staticSetting.get(target.build()).intValue());
+        assertNull(target.build().getAsInt("archived.foo.bar", null));
+    }
+
     public void testAddConsumer() {
         Setting<Integer> testSetting = Setting.intSetting("foo.bar", 1, Property.Dynamic, Property.NodeScope);
         Setting<Integer> testSetting2 = Setting.intSetting("foo.bar.baz", 1, Property.Dynamic, Property.NodeScope);
diff --git a/core/src/test/java/org/elasticsearch/index/query/IdsQueryBuilderTests.java b/core/src/test/java/org/elasticsearch/index/query/IdsQueryBuilderTests.java
index 2ad557dcc76..5913a038661 100644
--- a/core/src/test/java/org/elasticsearch/index/query/IdsQueryBuilderTests.java
+++ b/core/src/test/java/org/elasticsearch/index/query/IdsQueryBuilderTests.java
@@ -32,17 +32,9 @@ import org.elasticsearch.test.AbstractQueryTestCase;
 import java.io.IOException;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.contains;
 
 public class IdsQueryBuilderTests extends AbstractQueryTestCase<IdsQueryBuilder> {
-    /**
-     * Check that parser throws exception on missing values field.
-     */
-    public void testIdsNotProvided() throws IOException {
-        String noIdsFieldQuery = "{\"ids\" : { \"type\" : \"my_type\"  }";
-        ParsingException e = expectThrows(ParsingException.class, () -> parseQuery(noIdsFieldQuery));
-        assertThat(e.getMessage(), containsString("no ids values provided"));
-    }
 
     @Override
     protected IdsQueryBuilder doCreateTestQueryBuilder() {
@@ -71,7 +63,7 @@ public class IdsQueryBuilderTests extends AbstractQueryTestCase<IdsQueryBuilder>
         }
         IdsQueryBuilder query;
         if (types.length > 0 || randomBoolean()) {
-            query = new IdsQueryBuilder(types);
+            query = new IdsQueryBuilder().types(types);
             query.addIds(ids);
         } else {
             query = new IdsQueryBuilder();
@@ -90,11 +82,11 @@ public class IdsQueryBuilderTests extends AbstractQueryTestCase<IdsQueryBuilder>
     }
 
     public void testIllegalArguments() {
-        IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> new IdsQueryBuilder((String[]) null));
+        IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> new IdsQueryBuilder().types((String[]) null));
         assertEquals("[ids] types cannot be null", e.getMessage());
 
         IdsQueryBuilder idsQueryBuilder = new IdsQueryBuilder();
-        e = expectThrows(IllegalArgumentException.class, () -> idsQueryBuilder.addIds((String[])null));
+        e = expectThrows(IllegalArgumentException.class, () -> idsQueryBuilder.addIds((String[]) null));
         assertEquals("[ids] ids cannot be null", e.getMessage());
     }
 
@@ -102,7 +94,7 @@ public class IdsQueryBuilderTests extends AbstractQueryTestCase<IdsQueryBuilder>
     public void testIdsQueryWithInvalidValues() throws Exception {
         String query = "{ \"ids\": { \"values\": [[1]] } }";
         ParsingException e = expectThrows(ParsingException.class, () -> parseQuery(query));
-        assertEquals("Illegal value for id, expecting a string or number, got: START_ARRAY", e.getMessage());
+        assertEquals("[ids] failed to parse field [values]", e.getMessage());
     }
 
     public void testFromJson() throws IOException {
@@ -116,44 +108,82 @@ public class IdsQueryBuilderTests extends AbstractQueryTestCase<IdsQueryBuilder>
                 "}";
         IdsQueryBuilder parsed = (IdsQueryBuilder) parseQuery(json);
         checkGeneratedJson(json, parsed);
-        assertEquals(json, 3, parsed.ids().size());
+        assertThat(parsed.ids(), contains("1","100","4"));
         assertEquals(json, "my_type", parsed.types()[0]);
+
+        // check that type that is not an array and also ids that are numbers are parsed
+        json =
+                "{\n" +
+                "  \"ids\" : {\n" +
+                "    \"type\" : \"my_type\",\n" +
+                "    \"values\" : [ 1, 100, 4 ],\n" +
+                "    \"boost\" : 1.0\n" +
+                "  }\n" +
+                "}";
+        parsed = (IdsQueryBuilder) parseQuery(json);
+        assertThat(parsed.ids(), contains("1","100","4"));
+        assertEquals(json, "my_type", parsed.types()[0]);
+
+        // check with empty type array
+        json =
+                "{\n" +
+                "  \"ids\" : {\n" +
+                "    \"type\" : [ ],\n" +
+                "    \"values\" : [ \"1\", \"100\", \"4\" ],\n" +
+                "    \"boost\" : 1.0\n" +
+                "  }\n" +
+                "}";
+        parsed = (IdsQueryBuilder) parseQuery(json);
+        assertThat(parsed.ids(), contains("1","100","4"));
+        assertEquals(json, 0, parsed.types().length);
+
+        // check without type
+        json =
+                "{\n" +
+                "  \"ids\" : {\n" +
+                "    \"values\" : [ \"1\", \"100\", \"4\" ],\n" +
+                "    \"boost\" : 1.0\n" +
+                "  }\n" +
+                "}";
+        parsed = (IdsQueryBuilder) parseQuery(json);
+        assertThat(parsed.ids(), contains("1","100","4"));
+        assertEquals(json, 0, parsed.types().length);
     }
 
     public void testFromJsonDeprecatedSyntax() throws IOException {
-        IdsQueryBuilder tempQuery = createTestQueryBuilder();
-        assumeTrue("test requires at least one type", tempQuery.types() != null && tempQuery.types().length > 0);
-
-        String type = tempQuery.types()[0];
-        IdsQueryBuilder testQuery = new IdsQueryBuilder(type);
+        IdsQueryBuilder testQuery = new IdsQueryBuilder().types("my_type");
 
         //single value type can also be called _type
         final String contentString = "{\n" +
                 "    \"ids\" : {\n" +
-                "        \"_type\" : \"" + type + "\",\n" +
-                "        \"values\" : []\n" +
+                "        \"_type\" : \"my_type\",\n" +
+                "        \"values\" : [ ]\n" +
                 "    }\n" +
                 "}";
 
         IdsQueryBuilder parsed = (IdsQueryBuilder) parseQuery(contentString, ParseFieldMatcher.EMPTY);
         assertEquals(testQuery, parsed);
 
-        IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> parseQuery(contentString));
-        assertEquals("Deprecated field [_type] used, expected [type] instead", e.getMessage());
+        ParsingException e = expectThrows(ParsingException.class, () -> parseQuery(contentString));
         checkWarningHeaders("Deprecated field [_type] used, expected [type] instead");
+        assertEquals("Deprecated field [_type] used, expected [type] instead", e.getMessage());
+        assertEquals(3, e.getLineNumber());
+        assertEquals(19, e.getColumnNumber());
 
-        //array of types can also be called type rather than types
+        //array of types can also be called types rather than type
         final String contentString2 = "{\n" +
                 "    \"ids\" : {\n" +
-                "        \"types\" : [\"" + type + "\"],\n" +
-                "        \"values\" : []\n" +
+                "        \"types\" : [\"my_type\"],\n" +
+                "        \"values\" : [ ]\n" +
                 "    }\n" +
                 "}";
-        parsed = (IdsQueryBuilder) parseQuery(contentString, ParseFieldMatcher.EMPTY);
+        parsed = (IdsQueryBuilder) parseQuery(contentString2, ParseFieldMatcher.EMPTY);
         assertEquals(testQuery, parsed);
 
-        e = expectThrows(IllegalArgumentException.class, () -> parseQuery(contentString2));
+        e = expectThrows(ParsingException.class, () -> parseQuery(contentString2));
+        checkWarningHeaders("Deprecated field [types] used, expected [type] instead");
         assertEquals("Deprecated field [types] used, expected [type] instead", e.getMessage());
-        checkWarningHeaders("Deprecated field [_type] used, expected [type] instead");
+        assertEquals(3, e.getLineNumber());
+        assertEquals(19, e.getColumnNumber());
     }
 }
diff --git a/core/src/test/java/org/elasticsearch/index/query/MatchQueryBuilderTests.java b/core/src/test/java/org/elasticsearch/index/query/MatchQueryBuilderTests.java
index a4e202e2304..00d41aa754e 100644
--- a/core/src/test/java/org/elasticsearch/index/query/MatchQueryBuilderTests.java
+++ b/core/src/test/java/org/elasticsearch/index/query/MatchQueryBuilderTests.java
@@ -22,6 +22,7 @@ package org.elasticsearch.index.query;
 import org.apache.lucene.queries.ExtendedCommonTermsQuery;
 import org.apache.lucene.search.BooleanClause;
 import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.BoostQuery;
 import org.apache.lucene.search.FuzzyQuery;
 import org.apache.lucene.search.MatchAllDocsQuery;
 import org.apache.lucene.search.MatchNoDocsQuery;
@@ -29,11 +30,15 @@ import org.apache.lucene.search.PhraseQuery;
 import org.apache.lucene.search.PointRangeQuery;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.TermQuery;
+import org.elasticsearch.Version;
+import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
 import org.elasticsearch.common.ParseFieldMatcher;
 import org.elasticsearch.common.ParsingException;
+import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.lucene.search.MultiPhrasePrefixQuery;
 import org.elasticsearch.common.lucene.search.Queries;
 import org.elasticsearch.index.mapper.MappedFieldType;
+import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.search.MatchQuery;
 import org.elasticsearch.index.search.MatchQuery.Type;
 import org.elasticsearch.index.search.MatchQuery.ZeroTermsQuery;
@@ -458,4 +463,35 @@ public class MatchQueryBuilderTests extends AbstractQueryTestCase<MatchQueryBuil
                 "}";
         expectThrows(IllegalStateException.class, () -> parseQuery(json2));
     }
+
+    @Override
+    protected void initializeAdditionalMappings(MapperService mapperService) throws IOException {
+        mapperService.merge("t_boost", new CompressedXContent(PutMappingRequest.buildFromSimplifiedDef("t_boost",
+            "string_boost", "type=text,boost=4").string()), MapperService.MergeReason.MAPPING_UPDATE, false);
+    }
+
+    public void testMatchPhrasePrefixWithBoost() throws Exception {
+        assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
+        QueryShardContext context = createShardContext();
+        assumeTrue("test runs only when the index version is on or after V_5_0_0_alpha1",
+            context.indexVersionCreated().onOrAfter(Version.V_5_0_0_alpha1));
+
+        {
+            // field boost is applied on a single term query
+            MatchPhrasePrefixQueryBuilder builder = new MatchPhrasePrefixQueryBuilder("string_boost", "foo");
+            Query query = builder.toQuery(context);
+            assertThat(query, instanceOf(BoostQuery.class));
+            assertThat(((BoostQuery) query).getBoost(), equalTo(4f));
+            Query innerQuery = ((BoostQuery) query).getQuery();
+            assertThat(innerQuery, instanceOf(MultiPhrasePrefixQuery.class));
+        }
+
+        {
+            // field boost is ignored on phrase query
+            MatchPhrasePrefixQueryBuilder builder = new MatchPhrasePrefixQueryBuilder("string_boost", "foo bar");
+            Query query = builder.toQuery(context);
+            assertThat(query, instanceOf(MultiPhrasePrefixQuery.class));
+        }
+
+    }
 }
diff --git a/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterSearchIT.java b/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterSearchIT.java
index ed63ea1ea1c..8f8887bd150 100644
--- a/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterSearchIT.java
+++ b/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterSearchIT.java
@@ -24,7 +24,6 @@ import org.elasticsearch.Version;
 import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.action.search.SearchType;
 import org.elasticsearch.action.support.WriteRequest;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.common.geo.GeoPoint;
@@ -41,7 +40,6 @@ import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
 import org.elasticsearch.index.search.MatchQuery;
-import org.elasticsearch.indices.IndicesRequestCache;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.search.SearchHit;
@@ -106,6 +104,29 @@ public class HighlighterSearchIT extends ESIntegTestCase {
         return Collections.singletonList(InternalSettingsPlugin.class);
     }
 
+    public void testHighlightingWithStoredKeyword() throws IOException {
+        XContentBuilder mappings = jsonBuilder();
+        mappings.startObject();
+        mappings.startObject("type")
+            .startObject("properties")
+            .startObject("text")
+            .field("type", "keyword")
+            .field("store", true)
+            .endObject()
+            .endObject()
+            .endObject();
+        mappings.endObject();
+        assertAcked(prepareCreate("test")
+            .addMapping("type", mappings));
+        client().prepareIndex("test", "type", "1")
+            .setSource(jsonBuilder().startObject().field("text", "foo").endObject())
+            .get();
+        refresh();
+        SearchResponse search = client().prepareSearch().setQuery(matchQuery("text", "foo"))
+            .highlighter(new HighlightBuilder().field(new Field("text"))).get();
+        assertHighlight(search, 0, "text", 0, equalTo("<em>foo</em>"));
+    }
+
     public void testHighlightingWithWildcardName() throws IOException {
         // test the kibana case with * as fieldname that will try highlight all fields including meta fields
         XContentBuilder mappings = jsonBuilder();
diff --git a/core/src/test/java/org/elasticsearch/search/nested/SimpleNestedIT.java b/core/src/test/java/org/elasticsearch/search/nested/SimpleNestedIT.java
index ec18e528a40..442274d71e7 100644
--- a/core/src/test/java/org/elasticsearch/search/nested/SimpleNestedIT.java
+++ b/core/src/test/java/org/elasticsearch/search/nested/SimpleNestedIT.java
@@ -1053,8 +1053,6 @@ public class SimpleNestedIT extends ESIntegTestCase {
         assertThat(clusterStatsResponse.getIndicesStats().getSegments().getBitsetMemoryInBytes(), equalTo(0L));
     }
 
-    /**
-     */
     private void assertDocumentCount(String index, long numdocs) {
         IndicesStatsResponse stats = admin().indices().prepareStats(index).clear().setDocs(true).get();
         assertNoFailures(stats);
@@ -1062,5 +1060,4 @@ public class SimpleNestedIT extends ESIntegTestCase {
 
     }
 
-
 }
diff --git a/core/src/test/java/org/elasticsearch/search/query/QueryStringIT.java b/core/src/test/java/org/elasticsearch/search/query/QueryStringIT.java
index 540c67ae39d..c003038c7c2 100644
--- a/core/src/test/java/org/elasticsearch/search/query/QueryStringIT.java
+++ b/core/src/test/java/org/elasticsearch/search/query/QueryStringIT.java
@@ -255,6 +255,14 @@ public class QueryStringIT extends ESIntegTestCase {
                 containsString("Can't parse boolean value [foo], expected [true] or [false]"));
     }
 
+    public void testAllFieldsWithSpecifiedLeniency() throws IOException {
+        Exception e = expectThrows(Exception.class, () ->
+                client().prepareSearch("test").setQuery(
+                        queryStringQuery("f_date:[now-2D TO now]").lenient(false)).get());
+        assertThat(ExceptionsHelper.detailedMessage(e),
+                containsString("unit [D] not supported for date math [-2D]"));
+    }
+
     private void assertHits(SearchHits hits, String... ids) {
         assertThat(hits.totalHits(), equalTo((long) ids.length));
         Set<String> hitIds = new HashSet<>();
@@ -263,5 +271,4 @@ public class QueryStringIT extends ESIntegTestCase {
         }
         assertThat(hitIds, containsInAnyOrder(ids));
     }
-
 }
diff --git a/core/src/test/java/org/elasticsearch/search/query/SimpleQueryStringIT.java b/core/src/test/java/org/elasticsearch/search/query/SimpleQueryStringIT.java
index 60f89ab326e..1af3bb99b28 100644
--- a/core/src/test/java/org/elasticsearch/search/query/SimpleQueryStringIT.java
+++ b/core/src/test/java/org/elasticsearch/search/query/SimpleQueryStringIT.java
@@ -564,6 +564,18 @@ public class SimpleQueryStringIT extends ESIntegTestCase {
         assertHitCount(resp, 1L);
     }
 
+    public void testAllFieldsWithSpecifiedLeniency() throws IOException {
+        String indexBody = copyToStringFromClasspath("/org/elasticsearch/search/query/all-query-index.json");
+        prepareCreate("test").setSource(indexBody).get();
+        ensureGreen("test");
+
+        Exception e = expectThrows(Exception.class, () ->
+                client().prepareSearch("test").setQuery(
+                        simpleQueryStringQuery("foo123").lenient(false)).get());
+        assertThat(ExceptionsHelper.detailedMessage(e),
+                containsString("NumberFormatException[For input string: \"foo123\"]"));
+    }
+
     private void assertHits(SearchHits hits, String... ids) {
         assertThat(hits.totalHits(), equalTo((long) ids.length));
         Set<String> hitIds = new HashSet<>();
diff --git a/core/src/test/java/org/elasticsearch/tribe/TribeIT.java b/core/src/test/java/org/elasticsearch/tribe/TribeIT.java
index cf4fe03893f..179d977ea5d 100644
--- a/core/src/test/java/org/elasticsearch/tribe/TribeIT.java
+++ b/core/src/test/java/org/elasticsearch/tribe/TribeIT.java
@@ -22,12 +22,15 @@ package org.elasticsearch.tribe;
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
 import org.elasticsearch.action.support.DestructiveOperations;
 import org.elasticsearch.client.Client;
+import org.elasticsearch.cluster.ClusterChangedEvent;
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.cluster.ClusterState;
+import org.elasticsearch.cluster.ClusterStateUpdateTask;
 import org.elasticsearch.cluster.block.ClusterBlockException;
 import org.elasticsearch.cluster.health.ClusterHealthStatus;
 import org.elasticsearch.cluster.metadata.MetaData;
 import org.elasticsearch.cluster.node.DiscoveryNode;
+import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.Priority;
 import org.elasticsearch.common.UUIDs;
 import org.elasticsearch.common.lease.Releasable;
@@ -41,7 +44,10 @@ import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.test.ESIntegTestCase;
 import org.elasticsearch.test.InternalTestCluster;
 import org.elasticsearch.test.NodeConfigurationSource;
+import org.elasticsearch.test.TestCustomMetaData;
 import org.elasticsearch.transport.MockTcpTransportPlugin;
+import org.elasticsearch.tribe.TribeServiceTests.MergableCustomMetaData1;
+import org.elasticsearch.tribe.TribeServiceTests.MergableCustomMetaData2;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -52,9 +58,12 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.function.UnaryOperator;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
@@ -446,6 +455,132 @@ public class TribeIT extends ESIntegTestCase {
         }
     }
 
+    public void testMergingRemovedCustomMetaData() throws Exception {
+        MetaData.registerPrototype(MergableCustomMetaData1.TYPE, new MergableCustomMetaData1(""));
+        removeCustomMetaData(cluster1, MergableCustomMetaData1.TYPE);
+        removeCustomMetaData(cluster2, MergableCustomMetaData1.TYPE);
+        MergableCustomMetaData1 customMetaData1 = new MergableCustomMetaData1("a");
+        MergableCustomMetaData1 customMetaData2 = new MergableCustomMetaData1("b");
+        try (Releasable tribeNode = startTribeNode()) {
+            assertNodes(ALL);
+            putCustomMetaData(cluster1, customMetaData1);
+            putCustomMetaData(cluster2, customMetaData2);
+            assertCustomMetaDataUpdated(internalCluster(), customMetaData2);
+            removeCustomMetaData(cluster2, customMetaData2.type());
+            assertCustomMetaDataUpdated(internalCluster(), customMetaData1);
+        }
+    }
+
+    public void testMergingCustomMetaData() throws Exception {
+        MetaData.registerPrototype(MergableCustomMetaData1.TYPE, new MergableCustomMetaData1(""));
+        removeCustomMetaData(cluster1, MergableCustomMetaData1.TYPE);
+        removeCustomMetaData(cluster2, MergableCustomMetaData1.TYPE);
+        MergableCustomMetaData1 customMetaData1 = new MergableCustomMetaData1(randomAsciiOfLength(10));
+        MergableCustomMetaData1 customMetaData2 = new MergableCustomMetaData1(randomAsciiOfLength(10));
+        List<MergableCustomMetaData1> customMetaDatas = Arrays.asList(customMetaData1, customMetaData2);
+        Collections.sort(customMetaDatas, (cm1, cm2) -> cm2.getData().compareTo(cm1.getData()));
+        final MergableCustomMetaData1 tribeNodeCustomMetaData = customMetaDatas.get(0);
+        try (Releasable tribeNode = startTribeNode()) {
+            assertNodes(ALL);
+            putCustomMetaData(cluster1, customMetaData1);
+            assertCustomMetaDataUpdated(internalCluster(), customMetaData1);
+            putCustomMetaData(cluster2, customMetaData2);
+            assertCustomMetaDataUpdated(internalCluster(), tribeNodeCustomMetaData);
+        }
+    }
+
+    public void testMergingMultipleCustomMetaData() throws Exception {
+        MetaData.registerPrototype(MergableCustomMetaData1.TYPE, new MergableCustomMetaData1(""));
+        MetaData.registerPrototype(MergableCustomMetaData2.TYPE, new MergableCustomMetaData2(""));
+        removeCustomMetaData(cluster1, MergableCustomMetaData1.TYPE);
+        removeCustomMetaData(cluster2, MergableCustomMetaData1.TYPE);
+        MergableCustomMetaData1 firstCustomMetaDataType1 = new MergableCustomMetaData1(randomAsciiOfLength(10));
+        MergableCustomMetaData1 secondCustomMetaDataType1 = new MergableCustomMetaData1(randomAsciiOfLength(10));
+        MergableCustomMetaData2 firstCustomMetaDataType2 = new MergableCustomMetaData2(randomAsciiOfLength(10));
+        MergableCustomMetaData2 secondCustomMetaDataType2 = new MergableCustomMetaData2(randomAsciiOfLength(10));
+        List<MergableCustomMetaData1> mergedCustomMetaDataType1 = Arrays.asList(firstCustomMetaDataType1, secondCustomMetaDataType1);
+        List<MergableCustomMetaData2> mergedCustomMetaDataType2 = Arrays.asList(firstCustomMetaDataType2, secondCustomMetaDataType2);
+        Collections.sort(mergedCustomMetaDataType1, (cm1, cm2) -> cm2.getData().compareTo(cm1.getData()));
+        Collections.sort(mergedCustomMetaDataType2, (cm1, cm2) -> cm2.getData().compareTo(cm1.getData()));
+        try (Releasable tribeNode = startTribeNode()) {
+            assertNodes(ALL);
+            // test putting multiple custom md types propagates to tribe
+            putCustomMetaData(cluster1, firstCustomMetaDataType1);
+            putCustomMetaData(cluster1, firstCustomMetaDataType2);
+            assertCustomMetaDataUpdated(internalCluster(), firstCustomMetaDataType1);
+            assertCustomMetaDataUpdated(internalCluster(), firstCustomMetaDataType2);
+
+            // test multiple same type custom md is merged and propagates to tribe
+            putCustomMetaData(cluster2, secondCustomMetaDataType1);
+            assertCustomMetaDataUpdated(internalCluster(), firstCustomMetaDataType2);
+            assertCustomMetaDataUpdated(internalCluster(), mergedCustomMetaDataType1.get(0));
+
+            // test multiple same type custom md is merged and propagates to tribe
+            putCustomMetaData(cluster2, secondCustomMetaDataType2);
+            assertCustomMetaDataUpdated(internalCluster(), mergedCustomMetaDataType1.get(0));
+            assertCustomMetaDataUpdated(internalCluster(), mergedCustomMetaDataType2.get(0));
+
+            // test removing custom md is propagates to tribe
+            removeCustomMetaData(cluster2, secondCustomMetaDataType1.type());
+            assertCustomMetaDataUpdated(internalCluster(), firstCustomMetaDataType1);
+            assertCustomMetaDataUpdated(internalCluster(), mergedCustomMetaDataType2.get(0));
+            removeCustomMetaData(cluster2, secondCustomMetaDataType2.type());
+            assertCustomMetaDataUpdated(internalCluster(), firstCustomMetaDataType1);
+            assertCustomMetaDataUpdated(internalCluster(), firstCustomMetaDataType2);
+        }
+    }
+
+    private static void assertCustomMetaDataUpdated(InternalTestCluster cluster,
+                                                    TestCustomMetaData expectedCustomMetaData) throws Exception {
+        assertBusy(() -> {
+            ClusterState tribeState = cluster.getInstance(ClusterService.class, cluster.getNodeNames()[0]).state();
+            MetaData.Custom custom = tribeState.metaData().custom(expectedCustomMetaData.type());
+            assertNotNull(custom);
+            assertThat(custom, equalTo(expectedCustomMetaData));
+        });
+    }
+
+    private void removeCustomMetaData(InternalTestCluster cluster, final String customMetaDataType) {
+        logger.info("removing custom_md type [{}] from [{}]", customMetaDataType, cluster.getClusterName());
+        updateMetaData(cluster, builder -> builder.removeCustom(customMetaDataType));
+    }
+
+    private void putCustomMetaData(InternalTestCluster cluster, final TestCustomMetaData customMetaData) {
+        logger.info("putting custom_md type [{}] with data[{}] from [{}]", customMetaData.type(),
+                customMetaData.getData(), cluster.getClusterName());
+        updateMetaData(cluster, builder -> builder.putCustom(customMetaData.type(), customMetaData));
+    }
+
+    private static void updateMetaData(InternalTestCluster cluster, UnaryOperator<MetaData.Builder> addCustoms) {
+        ClusterService clusterService = cluster.getInstance(ClusterService.class, cluster.getMasterName());
+        final CountDownLatch latch = new CountDownLatch(1);
+        clusterService.submitStateUpdateTask("update customMetaData", new ClusterStateUpdateTask(Priority.IMMEDIATE) {
+            @Override
+            public void clusterStatePublished(ClusterChangedEvent clusterChangedEvent) {
+                latch.countDown();
+            }
+
+            @Override
+            public ClusterState execute(ClusterState currentState) throws Exception {
+                MetaData.Builder builder = MetaData.builder(currentState.metaData());
+                builder = addCustoms.apply(builder);
+                return new ClusterState.Builder(currentState).metaData(builder).build();
+            }
+
+            @Override
+            public void onFailure(String source, Exception e) {
+                fail("failed to apply cluster state from [" + source + "] with " + e.getMessage());
+            }
+        });
+        try {
+            latch.await(1, TimeUnit.MINUTES);
+        } catch (InterruptedException e) {
+            fail("latch waiting on publishing custom md interrupted [" + e.getMessage() + "]");
+        }
+        assertThat("timed out trying to add custom metadata to " + cluster.getClusterName(), latch.getCount(), equalTo(0L));
+
+    }
+
     private void assertIndicesExist(Client client, String... indices) throws Exception {
         assertBusy(() -> {
             ClusterState state = client.admin().cluster().prepareState().setRoutingTable(true).setMetaData(true).get().getState();
diff --git a/core/src/test/java/org/elasticsearch/tribe/TribeServiceTests.java b/core/src/test/java/org/elasticsearch/tribe/TribeServiceTests.java
index 43ee8fee151..7aea02c552b 100644
--- a/core/src/test/java/org/elasticsearch/tribe/TribeServiceTests.java
+++ b/core/src/test/java/org/elasticsearch/tribe/TribeServiceTests.java
@@ -19,9 +19,22 @@
 
 package org.elasticsearch.tribe;
 
+import org.elasticsearch.cluster.metadata.MetaData;
 import org.elasticsearch.common.network.NetworkModule;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.util.set.Sets;
 import org.elasticsearch.test.ESTestCase;
+import org.elasticsearch.test.TestCustomMetaData;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.hamcrest.Matchers.instanceOf;
 
 public class TribeServiceTests extends ESTestCase {
     public void testMinimalSettings() {
@@ -96,4 +109,128 @@ public class TribeServiceTests extends ESTestCase {
         assertEquals("7.7.7.7", clientSettings.get("transport.bind_host"));
         assertEquals("8.8.8.8", clientSettings.get("transport.publish_host"));
     }
+
+    public void testMergeCustomMetaDataSimple() {
+        Map<String, MetaData.Custom> mergedCustoms =
+                TribeService.mergeChangedCustomMetaData(Collections.singleton(MergableCustomMetaData1.TYPE),
+                        s -> Collections.singletonList(new MergableCustomMetaData1("data1")));
+        TestCustomMetaData mergedCustom = (TestCustomMetaData) mergedCustoms.get(MergableCustomMetaData1.TYPE);
+        assertThat(mergedCustom, instanceOf(MergableCustomMetaData1.class));
+        assertNotNull(mergedCustom);
+        assertEquals(mergedCustom.getData(), "data1");
+    }
+
+    public void testMergeCustomMetaData() {
+        Map<String, MetaData.Custom> mergedCustoms =
+                TribeService.mergeChangedCustomMetaData(Collections.singleton(MergableCustomMetaData1.TYPE),
+                        s -> Arrays.asList(new MergableCustomMetaData1("data1"), new MergableCustomMetaData1("data2")));
+        TestCustomMetaData mergedCustom = (TestCustomMetaData) mergedCustoms.get(MergableCustomMetaData1.TYPE);
+        assertThat(mergedCustom, instanceOf(MergableCustomMetaData1.class));
+        assertNotNull(mergedCustom);
+        assertEquals(mergedCustom.getData(), "data2");
+    }
+
+    public void testMergeMultipleCustomMetaData() {
+        Map<String, List<TribeService.MergableCustomMetaData>> inputMap = new HashMap<>();
+        inputMap.put(MergableCustomMetaData1.TYPE,
+                Arrays.asList(new MergableCustomMetaData1("data10"), new MergableCustomMetaData1("data11")));
+        inputMap.put(MergableCustomMetaData2.TYPE,
+                Arrays.asList(new MergableCustomMetaData2("data21"), new MergableCustomMetaData2("data20")));
+        Map<String, MetaData.Custom> mergedCustoms = TribeService.mergeChangedCustomMetaData(
+                        Sets.newHashSet(MergableCustomMetaData1.TYPE, MergableCustomMetaData2.TYPE), inputMap::get);
+        TestCustomMetaData mergedCustom = (TestCustomMetaData) mergedCustoms.get(MergableCustomMetaData1.TYPE);
+        assertNotNull(mergedCustom);
+        assertThat(mergedCustom, instanceOf(MergableCustomMetaData1.class));
+        assertEquals(mergedCustom.getData(), "data11");
+        mergedCustom = (TestCustomMetaData) mergedCustoms.get(MergableCustomMetaData2.TYPE);
+        assertNotNull(mergedCustom);
+        assertThat(mergedCustom, instanceOf(MergableCustomMetaData2.class));
+        assertEquals(mergedCustom.getData(), "data21");
+    }
+
+    public void testMergeCustomMetaDataFromMany() {
+        Map<String, List<TribeService.MergableCustomMetaData>> inputMap = new HashMap<>();
+        int n = randomIntBetween(3, 5);
+        List<TribeService.MergableCustomMetaData> customList1 = new ArrayList<>();
+        for (int i = 0; i <= n; i++) {
+            customList1.add(new MergableCustomMetaData1("data1"+String.valueOf(i)));
+        }
+        Collections.shuffle(customList1, random());
+        inputMap.put(MergableCustomMetaData1.TYPE, customList1);
+        List<TribeService.MergableCustomMetaData> customList2 = new ArrayList<>();
+        for (int i = 0; i <= n; i++) {
+            customList2.add(new MergableCustomMetaData2("data2"+String.valueOf(i)));
+        }
+        Collections.shuffle(customList2, random());
+        inputMap.put(MergableCustomMetaData2.TYPE, customList2);
+
+        Map<String, MetaData.Custom> mergedCustoms = TribeService.mergeChangedCustomMetaData(
+                        Sets.newHashSet(MergableCustomMetaData1.TYPE, MergableCustomMetaData2.TYPE), inputMap::get);
+        TestCustomMetaData mergedCustom = (TestCustomMetaData) mergedCustoms.get(MergableCustomMetaData1.TYPE);
+        assertNotNull(mergedCustom);
+        assertThat(mergedCustom, instanceOf(MergableCustomMetaData1.class));
+        assertEquals(mergedCustom.getData(), "data1"+String.valueOf(n));
+        mergedCustom = (TestCustomMetaData) mergedCustoms.get(MergableCustomMetaData2.TYPE);
+        assertNotNull(mergedCustom);
+        assertThat(mergedCustom, instanceOf(MergableCustomMetaData2.class));
+        assertEquals(mergedCustom.getData(), "data2"+String.valueOf(n));
+    }
+
+    static class MergableCustomMetaData1 extends TestCustomMetaData
+            implements TribeService.MergableCustomMetaData<MergableCustomMetaData1> {
+        public static final String TYPE = "custom_md_1";
+
+        protected MergableCustomMetaData1(String data) {
+            super(data);
+        }
+
+        @Override
+        protected TestCustomMetaData newTestCustomMetaData(String data) {
+            return new MergableCustomMetaData1(data);
+        }
+
+        @Override
+        public String type() {
+            return TYPE;
+        }
+
+        @Override
+        public EnumSet<MetaData.XContentContext> context() {
+            return EnumSet.of(MetaData.XContentContext.GATEWAY);
+        }
+
+        @Override
+        public MergableCustomMetaData1 merge(MergableCustomMetaData1 other) {
+            return (getData().compareTo(other.getData()) >= 0) ? this : other;
+        }
+    }
+
+    static class MergableCustomMetaData2 extends TestCustomMetaData
+            implements TribeService.MergableCustomMetaData<MergableCustomMetaData2> {
+        public static final String TYPE = "custom_md_2";
+
+        protected MergableCustomMetaData2(String data) {
+            super(data);
+        }
+
+        @Override
+        protected TestCustomMetaData newTestCustomMetaData(String data) {
+            return new MergableCustomMetaData2(data);
+        }
+
+        @Override
+        public String type() {
+            return TYPE;
+        }
+
+        @Override
+        public EnumSet<MetaData.XContentContext> context() {
+            return EnumSet.of(MetaData.XContentContext.GATEWAY);
+        }
+
+        @Override
+        public MergableCustomMetaData2 merge(MergableCustomMetaData2 other) {
+            return (getData().compareTo(other.getData()) >= 0) ? this : other;
+        }
+    }
 }
diff --git a/dev-tools/smoke_test_rc.py b/dev-tools/smoke_test_rc.py
index 9a2e7f9b786..c35e6a0075a 100644
--- a/dev-tools/smoke_test_rc.py
+++ b/dev-tools/smoke_test_rc.py
@@ -69,8 +69,6 @@ DEFAULT_PLUGINS = ["analysis-icu",
                    "ingest-attachment",
                    "ingest-geoip",
                    "ingest-user-agent",
-                   "lang-javascript",
-                   "lang-python",
                    "mapper-attachments",
                    "mapper-murmur3",
                    "mapper-size",
@@ -297,6 +295,3 @@ if __name__ == "__main__":
   else:
     download_url = 'https://staging.elastic.co/%s-%s/downloads/elasticsearch' % (version, hash)
   download_and_verify(version, hash, files, download_url, plugins=DEFAULT_PLUGINS + plugins)
-
-
-
diff --git a/docs/java-api/docs/bulk.asciidoc b/docs/java-api/docs/bulk.asciidoc
index 0b43b89c07c..288bd8415ab 100644
--- a/docs/java-api/docs/bulk.asciidoc
+++ b/docs/java-api/docs/bulk.asciidoc
@@ -71,7 +71,7 @@ BulkProcessor bulkProcessor = BulkProcessor.builder(
                                   Throwable failure) { ... } <4>
         })
         .setBulkActions(10000) <5>
-        .setBulkSize(new ByteSizeValue(1, ByteSizeUnit.GB)) <6>
+        .setBulkSize(new ByteSizeValue(5, ByteSizeUnit.MB)) <6>
         .setFlushInterval(TimeValue.timeValueSeconds(5)) <7>
         .setConcurrentRequests(1) <8>
         .setBackoffPolicy(
@@ -85,7 +85,7 @@ BulkProcessor bulkProcessor = BulkProcessor.builder(
     with `response.hasFailures()`
 <4> This method is called when the bulk failed and raised a `Throwable`
 <5> We want to execute the bulk every 10 000 requests
-<6> We want to flush the bulk every 1gb
+<6> We want to flush the bulk every 5mb
 <7> We want to flush the bulk every 5 seconds whatever the number of requests
 <8> Set the number of concurrent requests. A value of 0 means that only a single request will  be allowed to be
     executed. A value of 1 means 1 concurrent request is allowed to be executed while accumulating new bulk requests.
diff --git a/docs/plugins/discovery-ec2.asciidoc b/docs/plugins/discovery-ec2.asciidoc
index 4c21f7fcc92..474e4f587e3 100644
--- a/docs/plugins/discovery-ec2.asciidoc
+++ b/docs/plugins/discovery-ec2.asciidoc
@@ -250,9 +250,20 @@ name - highly undesirable). Tagging elasticsearch ec2 nodes and then filtering b
 [[discovery-ec2-attributes]]
 ===== Automatic Node Attributes
 
-Though not dependent on actually using `ec2` as discovery (but still requires the cloud aws plugin installed), the
-plugin can automatically add node attributes relating to ec2 (for example, availability zone, that can be used with
-the awareness allocation feature). In order to enable it, set `cloud.node.auto_attributes` to `true` in the settings.
+Though not dependent on actually using `ec2` as discovery (but still requires the `discovery-ec2` plugin installed), the
+plugin can automatically add node attributes relating to ec2. In the future this may support other attributes, but this will
+currently only add an `aws_availability_zone` node attribute, which is the availability zone of the current node. Attributes
+can be used to isolate primary and replica shards across availability zones by using the
+{ref}/allocation-awareness.html[Allocation Awareness] feature.
+
+In order to enable it, set `cloud.node.auto_attributes` to `true` in the settings. For example:
+
+[source,yaml]
+----
+cloud.node.auto_attributes: true
+
+cluster.routing.allocation.awareness.attributes: aws_availability_zone
+----
 
 [[discovery-ec2-endpoint]]
 ===== Using other EC2 endpoint
diff --git a/docs/plugins/discovery-file.asciidoc b/docs/plugins/discovery-file.asciidoc
index 15175620d52..ec501a08a8a 100644
--- a/docs/plugins/discovery-file.asciidoc
+++ b/docs/plugins/discovery-file.asciidoc
@@ -1,7 +1,7 @@
 [[discovery-file]]
 === File-Based Discovery Plugin
 
-The file-based discovery plugin uses a list of hosts/ports in a `unicast_hosts.txt` file 
+The file-based discovery plugin uses a list of hosts/ports in a `unicast_hosts.txt` file
 in the `config/discovery-file` directory for unicast discovery.
 
 [[discovery-file-install]]
@@ -20,6 +20,10 @@ be restarted after installation. Note that installing the plugin will add a
 `discovery-file` directory to the `config` folder, and a default `unicast_hosts.txt`
 file that must be edited with the correct unicast hosts list before starting the node.
 
+This plugin can be downloaded for <<plugin-management-custom-url,offline install>> from
+{plugin_url}/discovery-file/discovery-file-{version}.zip.
+
+
 [[discovery-file-remove]]
 [float]
 ==== Removal
@@ -37,7 +41,7 @@ The node must be stopped before removing the plugin.
 [float]
 ==== Using the file-based discovery plugin
 
-The file-based discovery plugin provides the ability to specify the 
+The file-based discovery plugin provides the ability to specify the
 unicast hosts list through a simple `unicast_hosts.txt` file that can
 be dynamically updated at any time. To enable, add the following in `elasticsearch.yml`:
 
@@ -47,12 +51,12 @@ discovery.zen.hosts_provider: file
 ----
 
 This plugin simply provides a facility to supply the unicast hosts list for
-zen discovery through an external file that can be updated at any time by a side process.  
+zen discovery through an external file that can be updated at any time by a side process.
 
-For example, this gives a convenient mechanism for an Elasticsearch instance 
-that is  run in docker containers to be dynamically supplied a list of IP 
-addresses to connect to for zen discovery when those IP addresses may not be 
-known at node startup.  
+For example, this gives a convenient mechanism for an Elasticsearch instance
+that is  run in docker containers to be dynamically supplied a list of IP
+addresses to connect to for zen discovery when those IP addresses may not be
+known at node startup.
 
 Note that the file-based discovery plugin is meant to augment the unicast
 hosts list in `elasticsearch.yml` (if specified), not replace it.  Therefore,
@@ -73,11 +77,11 @@ cannot start in the middle of a line).
 [float]
 ==== unicast_hosts.txt file format
 
-The format of the file is to specify one unicast host entry per line.  
+The format of the file is to specify one unicast host entry per line.
 Each unicast host entry consists of the host (host name or IP address) and
-an optional transport port number.  If the port number is specified, is must 
-come immediately after the host (on the same line) separated by a `:`. 
-If the port number is not specified, a default value of 9300 is used.  
+an optional transport port number.  If the port number is specified, is must
+come immediately after the host (on the same line) separated by a `:`.
+If the port number is not specified, a default value of 9300 is used.
 
 For example, this is an example of `unicast_hosts.txt` for a cluster with
 four nodes that participate in unicast discovery, some of which are not
@@ -92,6 +96,6 @@ running on the default port:
 [2001:0db8:85a3:0000:0000:8a2e:0370:7334]:9301
 ----------------------------------------------------------------
 
-Host names are allowed instead of IP addresses (similar to 
+Host names are allowed instead of IP addresses (similar to
 `discovery.zen.ping.unicast.hosts`), and IPv6 addresses must be
-specified in brackets with the port coming after the brackets. 
+specified in brackets with the port coming after the brackets.
diff --git a/docs/plugins/index.asciidoc b/docs/plugins/index.asciidoc
index ec1954a86a8..569e24fda8e 100644
--- a/docs/plugins/index.asciidoc
+++ b/docs/plugins/index.asciidoc
@@ -56,8 +56,6 @@ include::management.asciidoc[]
 
 include::mapper.asciidoc[]
 
-include::scripting.asciidoc[]
-
 include::security.asciidoc[]
 
 include::repository.asciidoc[]
diff --git a/docs/plugins/integrations.asciidoc b/docs/plugins/integrations.asciidoc
index 503f1274d81..9bf0a4c0458 100644
--- a/docs/plugins/integrations.asciidoc
+++ b/docs/plugins/integrations.asciidoc
@@ -27,7 +27,10 @@ Integrations are not plugins, but are external tools or modules that make it eas
   Tiki has native support for Elasticsearch. This provides faster & better
   search (facets, etc), along with some Natural Language Processing features
   (ex.: More like this)
-
+  
+* http://extensions.xwiki.org/xwiki/bin/view/Extension/Elastic+Search+Macro/[XWiki Next Generation Wiki]:
+  XWiki has an Elasticsearch and Kibana macro allowing to run Elasticsearch queries and display the results in XWiki pages using XWiki's scripting language as well as include Kibana Widgets in XWiki pages
+ 
 [float]
 [[data-integrations]]
 === Data import/export and validation
diff --git a/docs/plugins/lang-javascript.asciidoc b/docs/plugins/lang-javascript.asciidoc
deleted file mode 100644
index 001b7f22231..00000000000
--- a/docs/plugins/lang-javascript.asciidoc
+++ /dev/null
@@ -1,189 +0,0 @@
-[[lang-javascript]]
-=== JavaScript Language Plugin
-
-deprecated[5.0.0,JavaScript will be replaced by the new scripting language {ref}/modules-scripting-painless.html[`Painless`]]
-
-The JavaScript language plugin enables the use of JavaScript in Elasticsearch
-scripts, via Mozilla's
-https://developer.mozilla.org/en-US/docs/Mozilla/Projects/Rhino[Rhino JavaScript] engine.
-
-[[lang-javascript-install]]
-[float]
-==== Installation
-
-This plugin can be installed using the plugin manager:
-
-[source,sh]
-----------------------------------------------------------------
-sudo bin/elasticsearch-plugin install lang-javascript
-----------------------------------------------------------------
-
-The plugin must be installed on every node in the cluster, and each node must
-be restarted after installation.
-
-This plugin can be downloaded for <<plugin-management-custom-url,offline install>> from
-{plugin_url}/lang-javascript/lang-javascript-{version}.zip.
-
-[[lang-javascript-remove]]
-[float]
-==== Removal
-
-The plugin can be removed with the following command:
-
-[source,sh]
-----------------------------------------------------------------
-sudo bin/elasticsearch-plugin remove lang-javascript
-----------------------------------------------------------------
-
-The node must be stopped before removing the plugin.
-
-[[lang-javascript-usage]]
-==== Using JavaScript in Elasticsearch
-
-Once the plugin has been installed, JavaScript can be used at a scripting
-language by setting the `lang` parameter to `javascript`.
-
-Scripting is available in many APIs, but we will use an example with the
-`function_score` for demonstration purposes:
-
-[[lang-javascript-inline]]
-[float]
-=== Inline scripts
-
-WARNING: Enabling inline scripting on an unprotected Elasticsearch cluster is dangerous.
-See <<lang-javascript-file>> for a safer option.
-
-If you have enabled {ref}/modules-scripting-security.html#enable-dynamic-scripting[inline scripts],
-you can use JavaScript as follows:
-
-[source,js]
-----
-PUT test/doc/1
-{
-  "num": 1.0
-}
-
-PUT test/doc/2
-{
-  "num": 2.0
-}
-
-GET test/_search
-{
-  "query": {
-    "function_score": {
-      "script_score": {
-        "script": {
-          "inline": "doc[\"num\"].value * factor",
-          "lang": "javascript",
-          "params": {
-            "factor": 2
-          }
-        }
-      }
-    }
-  }
-}
-----
-// CONSOLE
-
-[[lang-javascript-stored]]
-[float]
-=== Stored scripts
-
-WARNING: Enabling stored scripts on an unprotected Elasticsearch cluster is dangerous.
-See <<lang-javascript-file>> for a safer option.
-
-If you have enabled {ref}/modules-scripting-security.html#enable-dynamic-scripting[stored scripts],
-you can use JavaScript as follows:
-
-[source,js]
-----
-PUT test/doc/1
-{
-  "num": 1.0
-}
-
-PUT test/doc/2
-{
-  "num": 2.0
-}
-
-POST _scripts/javascript/my_script  <1>
-{
-  "script": "doc[\"num\"].value * factor"
-}
-
-GET test/_search
-{
-  "query": {
-    "function_score": {
-      "script_score": {
-        "script": {
-          "stored": "my_script", <2>
-          "lang": "javascript",
-          "params": {
-            "factor": 2
-          }
-        }
-      }
-    }
-  }
-}
-----
-// CONSOLE
-
-<1> We store the script under the id `my_script`.
-<2> The function score query retrieves the script with id `my_script`.
-
-
-[[lang-javascript-file]]
-[float]
-=== File scripts
-
-You can save your scripts to a file in the `config/scripts/` directory on
-every node. The `.javascript` file suffix identifies the script as containing
-JavaScript:
-
-First, save this file as `config/scripts/my_script.js` on every node
-in the cluster:
-
-[source,painless]
-----
-doc["num"].value * factor
-----
-
-then use the script as follows:
-
-[source,js]
-----
-PUT test/doc/1
-{
-  "num": 1.0
-}
-
-PUT test/doc/2
-{
-  "num": 2.0
-}
-
-GET test/_search
-{
-  "query": {
-    "function_score": {
-      "script_score": {
-        "script": {
-          "file": "my_script", <1>
-          "lang": "javascript",
-          "params": {
-            "factor": 2
-          }
-        }
-      }
-    }
-  }
-}
-----
-// CONSOLE
-
-<1> The function score query retrieves the script with filename `my_script.javascript`.
diff --git a/docs/plugins/lang-python.asciidoc b/docs/plugins/lang-python.asciidoc
deleted file mode 100644
index 0e328d79f60..00000000000
--- a/docs/plugins/lang-python.asciidoc
+++ /dev/null
@@ -1,189 +0,0 @@
-[[lang-python]]
-=== Python Language Plugin
-
-deprecated[5.0.0,Python will be replaced by the new scripting language {ref}/modules-scripting-painless.html[`Painless`]]
-
-The Python language plugin enables the use of Python in Elasticsearch
-scripts, via the http://www.jython.org/[Jython] Java implementation of Python.
-
-[[lang-python-install]]
-[float]
-==== Installation
-
-This plugin can be installed using the plugin manager:
-
-[source,sh]
-----------------------------------------------------------------
-sudo bin/elasticsearch-plugin install lang-python
-----------------------------------------------------------------
-
-The plugin must be installed on every node in the cluster, and each node must
-be restarted after installation.
-
-This plugin can be downloaded for <<plugin-management-custom-url,offline install>> from
-{plugin_url}/lang-python/lang-python-{version}.zip.
-
-[[lang-python-remove]]
-[float]
-==== Removal
-
-The plugin can be removed with the following command:
-
-[source,sh]
-----------------------------------------------------------------
-sudo bin/elasticsearch-plugin remove lang-python
-----------------------------------------------------------------
-
-The node must be stopped before removing the plugin.
-
-[[lang-python-usage]]
-==== Using Python in Elasticsearch
-
-Once the plugin has been installed, Python can be used at a scripting
-language by setting the `lang` parameter to `python`.
-
-Scripting is available in many APIs, but we will use an example with the
-`function_score` for demonstration purposes:
-
-[[lang-python-inline]]
-[float]
-=== Inline scripts
-
-WARNING: Enabling inline scripting on an unprotected Elasticsearch cluster is dangerous.
-See <<lang-python-file>> for a safer option.
-
-If you have enabled {ref}/modules-scripting-security.html#enable-dynamic-scripting[inline scripts],
-you can use Python as follows:
-
-[source,js]
-----
-PUT test/doc/1
-{
-  "num": 1.0
-}
-
-PUT test/doc/2
-{
-  "num": 2.0
-}
-
-GET test/_search
-{
-  "query": {
-    "function_score": {
-      "script_score": {
-        "script": {
-          "inline": "doc[\"num\"].value * factor",
-          "lang": "python",
-          "params": {
-            "factor": 2
-          }
-        }
-      }
-    }
-  }
-}
-----
-// CONSOLE
-
-[[lang-python-stored]]
-[float]
-=== Stored scripts
-
-WARNING: Enabling stored scripts on an unprotected Elasticsearch cluster is dangerous.
-See <<lang-python-file>> for a safer option.
-
-If you have enabled {ref}/modules-scripting-security.html#enable-dynamic-scripting[stored scripts],
-you can use Python as follows:
-
-[source,js]
-----
-PUT test/doc/1
-{
-  "num": 1.0
-}
-
-PUT test/doc/2
-{
-  "num": 2.0
-}
-
-POST _scripts/python/my_script  <1>
-{
-  "script": "doc[\"num\"].value * factor"
-}
-
-GET test/_search
-{
-  "query": {
-    "function_score": {
-      "script_score": {
-        "script": {
-          "stored": "my_script", <2>
-          "lang": "python",
-          "params": {
-            "factor": 2
-          }
-        }
-      }
-    }
-  }
-}
-
-----
-// CONSOLE
-
-<1> We store the script under the id `my_script`.
-<2> The function score query retrieves the script with id `my_script`.
-
-
-[[lang-python-file]]
-[float]
-=== File scripts
-
-You can save your scripts to a file in the `config/scripts/` directory on
-every node. The `.py` file suffix identifies the script as containing
-Python:
-
-First, save this file as `config/scripts/my_script.py` on every node
-in the cluster:
-
-[source,python]
-----
-doc["num"].value * factor
-----
-
-then use the script as follows:
-
-[source,js]
-----
-PUT test/doc/1
-{
-  "num": 1.0
-}
-
-PUT test/doc/2
-{
-  "num": 2.0
-}
-
-GET test/_search
-{
-  "query": {
-    "function_score": {
-      "script_score": {
-        "script": {
-          "file": "my_script", <1>
-          "lang": "python",
-          "params": {
-            "factor": 2
-          }
-        }
-      }
-    }
-  }
-}
-----
-// CONSOLE
-
-<1> The function score query retrieves the script with filename `my_script.py`.
diff --git a/docs/plugins/scripting.asciidoc b/docs/plugins/scripting.asciidoc
deleted file mode 100644
index fc601fd4709..00000000000
--- a/docs/plugins/scripting.asciidoc
+++ /dev/null
@@ -1,25 +0,0 @@
-[[scripting]]
-== Scripting Plugins
-
-Scripting plugins extend the scripting functionality in Elasticsearch to allow
-the use of other scripting languages.
-
-[float]
-=== Core scripting plugins
-
-The core scripting plugins are:
-
-<<lang-javascript,JavaScript Language>>::
-
-The JavaScript language plugin enables the use of JavaScript in Elasticsearch
-scripts, via Mozilla's
-https://developer.mozilla.org/en-US/docs/Mozilla/Projects/Rhino[Rhino JavaScript] engine.
-
-<<lang-python,Python Language>>::
-
-The Python language plugin enables the use of Python in Elasticsearch
-scripts, via the http://www.jython.org/[Jython] Java implementation of Python.
-
-include::lang-javascript.asciidoc[]
-
-include::lang-python.asciidoc[]
diff --git a/docs/reference/aggregations/bucket/filters-aggregation.asciidoc b/docs/reference/aggregations/bucket/filters-aggregation.asciidoc
index 5f5d6c54b6a..7ba9d22d8d9 100644
--- a/docs/reference/aggregations/bucket/filters-aggregation.asciidoc
+++ b/docs/reference/aggregations/bucket/filters-aggregation.asciidoc
@@ -107,7 +107,7 @@ request.  The response for this example would be:
         {
           "doc_count" : 34,
           "monthly" : {
-            "buckets : [
+            "buckets" : [
               ... // the histogram monthly breakdown
             ]
           }
@@ -115,7 +115,7 @@ request.  The response for this example would be:
         {
           "doc_count" : 439,
           "monthly" : {
-            "buckets : [
+            "buckets" : [
               ... // the histogram monthly breakdown
             ]
           }
diff --git a/docs/reference/cat/plugins.asciidoc b/docs/reference/cat/plugins.asciidoc
index b4aa02a7af7..6343480228c 100644
--- a/docs/reference/cat/plugins.asciidoc
+++ b/docs/reference/cat/plugins.asciidoc
@@ -28,8 +28,6 @@ U7321H6 ingest-attachment       {version} Ingest processor that uses Apache Tika
 U7321H6 ingest-geoip            {version} Ingest processor that uses looksup geo data based on ip adresses using the Maxmind geo database
 U7321H6 ingest-user-agent       {version} Ingest processor that extracts information from a user agent
 U7321H6 jvm-example             {version} Demonstrates all the pluggable Java entry points in Elasticsearch
-U7321H6 lang-javascript         {version} The JavaScript language plugin allows to have javascript as the language of scripts to execute.
-U7321H6 lang-python             {version} The Python language plugin allows to have python as the language of scripts to execute.
 U7321H6 mapper-murmur3          {version} The Mapper Murmur3 plugin allows to compute hashes of a field's values at index-time and to store them in the index.
 U7321H6 mapper-size             {version} The Mapper Size plugin allows document to record their uncompressed size at index time.
 U7321H6 store-smb               {version} The Store SMB plugin adds support for SMB stores.
diff --git a/docs/reference/getting-started.asciidoc b/docs/reference/getting-started.asciidoc
index e9e3af44d86..26d0f6a6f83 100755
--- a/docs/reference/getting-started.asciidoc
+++ b/docs/reference/getting-started.asciidoc
@@ -201,7 +201,7 @@ Let's start with a basic health check, which we can use to see how our cluster i
 To check the cluster health, we will be using the <<cat,`_cat` API>>. You can
 run the command below in https://www.elastic.co/guide/en/kibana/{branch}/console-kibana.html[Kibana's Console]
 by clicking "VIEW IN CONSOLE" or with `curl` by clicking the "COPY AS CURL"
-link below and pasting the into a terminal.
+link below and pasting it into a terminal.
 
 [source,js]
 --------------------------------------------------
diff --git a/docs/reference/how-to/general.asciidoc b/docs/reference/how-to/general.asciidoc
index 60f0181b2bb..0900c49ce06 100644
--- a/docs/reference/how-to/general.asciidoc
+++ b/docs/reference/how-to/general.asciidoc
@@ -11,6 +11,35 @@ for workloads that fall into the database domain, such as retrieving all
 documents that match a particular query. If you need to do this, make sure to
 use the <<search-request-scroll,Scroll>> API.
 
+[float]
+[[maximum-document-size]]
+=== Avoid large documents
+
+Given that the default <<modules-http,`http.max_context_length`>> is set to
+100MB, Elasticsearch will refuse to index any document that is larger than
+that. You might decide to increase that particular setting, but Lucene still
+has a limit of about 2GB.
+
+Even without considering hard limits, large documents are usually not
+practical. Large documents put more stress on network, memory usage and disk,
+even for search requests that do not request the `_source` since Elasticsearch
+needs to fetch the `_id` of the document in all cases, and the cost of getting
+this field is bigger for large documents due to how the filesystem cache works.
+Indexing this document can use an amount of memory that is a multiplier of the
+original size of the document. Proximity search (phrase queries for instance)
+and <<search-request-highlighting,highlighting>> also become more expensive
+since their cost directly depends on the size of the original document.
+
+It is sometimes useful to reconsider what the unit of information should be.
+For instance, the fact you want to make books searchable doesn't necesarily
+mean that a document should consist of a whole book. It might be a better idea
+to use chapters or even paragraphs as documents, and then have a property in
+these documents that identifies which book they belong to. This does not only
+avoid the issues with large documents, it also makes the search experience
+better. For instance if a user searches for two words `foo` and `bar`, a match
+across different chapters is probably very poor, while a match within the same
+paragraph is likely good.
+
 [float]
 [[sparsity]]
 === Avoid sparsity
diff --git a/docs/reference/indices/rollover-index.asciidoc b/docs/reference/indices/rollover-index.asciidoc
index 20ffdd44b30..db78104be12 100644
--- a/docs/reference/indices/rollover-index.asciidoc
+++ b/docs/reference/indices/rollover-index.asciidoc
@@ -7,7 +7,7 @@ index is considered to be too large or too old.
 The API accepts a single alias name and a list of `conditions`.  The alias
 must point to a single index only.  If the index satisfies the specified
 conditions then a new index is created and the alias is switched to point to
-the new alias.
+the new index.
 
 
 [source,js]
diff --git a/docs/reference/indices/templates.asciidoc b/docs/reference/indices/templates.asciidoc
index 96ca5dcd1c7..c5e50e18c6e 100644
--- a/docs/reference/indices/templates.asciidoc
+++ b/docs/reference/indices/templates.asciidoc
@@ -41,11 +41,11 @@ PUT _template/template_1
 // TESTSETUP
 
 NOTE: Index templates provide C-style /* */ block comments. Comments are allowed
-everywhere in the JSON document except before to the initial opening curly bracket. 
+everywhere in the JSON document except before the initial opening curly bracket. 
 
-Defines a template named template_1, with a template pattern of `te*`.
+Defines a template named `template_1`, with a template pattern of `te*`.
 The settings and mappings will be applied to any index name that matches
-the `te*` template.
+the `te*` pattern.
 
 It is also possible to include aliases in an index template as follows:
 
@@ -72,8 +72,8 @@ PUT _template/template_1
 // CONSOLE
 // TEST[s/^/DELETE _template\/template_1\n/]
 
-<1> the `{index}` placeholder within the alias name will be replaced with the
-actual index name that the template gets applied to during index creation.
+<1> the `{index}` placeholder in the alias name will be replaced with the
+actual index name that the template gets applied to, during index creation.
 
 [float]
 [[delete]]
@@ -120,7 +120,7 @@ GET /_template
 
 [float]
 [[indices-templates-exists]]
-=== Templates exists
+=== Template exists
 
 Used to check if the template exists or not. For example:
 
@@ -131,11 +131,12 @@ HEAD _template/template_1
 // CONSOLE
 
 The HTTP status code indicates if the template with the given name
-exists or not. A status code `200` means it exists, a `404` it does not.
+exists or not. Status code `200` means it exists and `404` means
+it does not.
 
 [float]
 [[multiple-templates]]
-=== Multiple Template Matching
+=== Multiple Templates Matching
 
 Multiple index templates can potentially match an index, in this case,
 both the settings and mappings are merged into the final configuration
@@ -177,7 +178,7 @@ PUT /_template/template_2
 // TEST[s/^/DELETE _template\/template_1\n/]
 
 The above will disable storing the `_source` on all `type1` types, but
-for indices of that start with `te*`, source will still be enabled.
+for indices that start with `te*`, `_source` will still be enabled.
 Note, for mappings, the merging is "deep", meaning that specific
 object/property based mappings can easily be added/overridden on higher
 order templates, with lower order templates providing the basis.
@@ -206,7 +207,7 @@ PUT /_template/template_1
 --------------------------------------------------
 // CONSOLE
 
-To check for the `version`, you can
+To check the `version`, you can
 <<common-options-response-filtering, filter responses>>
 using `filter_path` to limit the response to just the `version`:
 
diff --git a/docs/reference/migration/migrate_6_0.asciidoc b/docs/reference/migration/migrate_6_0.asciidoc
index cfe9f71f80e..48057a8c0cc 100644
--- a/docs/reference/migration/migrate_6_0.asciidoc
+++ b/docs/reference/migration/migrate_6_0.asciidoc
@@ -25,6 +25,7 @@ way to reindex old indices is to use the `reindex` API.
 === Also see:
 
 * <<breaking_60_cat_changes>>
+* <<breaking_60_stats_changes>>
 * <<breaking_60_rest_changes>>
 * <<breaking_60_search_changes>>
 * <<breaking_60_docs_changes>>
@@ -35,6 +36,8 @@ way to reindex old indices is to use the `reindex` API.
 
 include::migrate_6_0/cat.asciidoc[]
 
+include::migrate_6_0/stats.asciidoc[]
+
 include::migrate_6_0/rest.asciidoc[]
 
 include::migrate_6_0/search.asciidoc[]
diff --git a/docs/reference/migration/migrate_6_0/settings.asciidoc b/docs/reference/migration/migrate_6_0/settings.asciidoc
index ea1162e005a..2dcedc8d219 100644
--- a/docs/reference/migration/migrate_6_0/settings.asciidoc
+++ b/docs/reference/migration/migrate_6_0/settings.asciidoc
@@ -7,4 +7,10 @@ The internal setting `cluster.routing.allocation.snapshot.relocation_enabled` th
 different nodes has been removed. Enabling this setting could cause allocation issues if a shard got allocated off a node and then
 reallocated back to this node while a snapshot was running.
 
+==== Store throttling settings
 
+Store throttling has been removed. As a consequence, the
+`indices.store.throttle.type` and `indices.store.throttle.max_bytes_per_sec`
+cluster settings and the `index.store.throttle.type` and
+`index.store.throttle.max_bytes_per_sec` index settings are not
+recognized anymore.
diff --git a/docs/reference/migration/migrate_6_0/stats.asciidoc b/docs/reference/migration/migrate_6_0/stats.asciidoc
new file mode 100644
index 00000000000..633604f39ae
--- /dev/null
+++ b/docs/reference/migration/migrate_6_0/stats.asciidoc
@@ -0,0 +1,7 @@
+[[breaking_60_stats_changes]]
+=== Stats and info changes
+
+==== Removal of `throttle_time` in the `store` stats
+
+Given that store throttling has been removed, the `store` stats do not report
+`throttle_time` anymore.
diff --git a/docs/reference/modules.asciidoc b/docs/reference/modules.asciidoc
index 5a39cdfd790..2ab1232d3b5 100644
--- a/docs/reference/modules.asciidoc
+++ b/docs/reference/modules.asciidoc
@@ -45,10 +45,10 @@ The modules in this section are:
 <<modules-node,Node client>>::
 
     A Java node client joins the cluster, but doesn't hold data or act as a master node.
-    
+
 <<modules-scripting-painless,Painless>>::
 
-    A built-in scripting language for Elasticsearch that's designed to be as secure as possible. 
+    A built-in scripting language for Elasticsearch that's designed to be as secure as possible.
 
 <<modules-plugins,Plugins>>::
 
@@ -56,8 +56,8 @@ The modules in this section are:
 
 <<modules-scripting,Scripting>>::
 
-    Custom scripting available in Lucene Expressions, Groovy, Python, and
-    Javascript. You can also write scripts in the built-in scripting language, 
+    Custom scripting available in Lucene Expressions, ad Groovy. You can also
+    write scripts in the built-in scripting language,
     <<modules-scripting-painless, Painless>>.
 
 <<modules-snapshots,Snapshot/Restore>>::
@@ -105,7 +105,3 @@ include::modules/threadpool.asciidoc[]
 include::modules/transport.asciidoc[]
 
 include::modules/tribe.asciidoc[]
-
-
-
-
diff --git a/docs/reference/modules/scripting.asciidoc b/docs/reference/modules/scripting.asciidoc
index 253fab3941b..1f4b66d95bd 100644
--- a/docs/reference/modules/scripting.asciidoc
+++ b/docs/reference/modules/scripting.asciidoc
@@ -30,14 +30,6 @@ and give the most flexibility.
     |<<modules-scripting-security, no>>
     |built-in
 
-|{plugins}/lang-javascript.html[`javascript`]
-    |<<modules-scripting-security, no>>
-    |{plugins}/lang-javascript.html[`lang-javascript`]
-
-|{plugins}/lang-python.html[`python`]
-    |<<modules-scripting-security, no>>
-    |{plugins}/lang-python.html[`lang-python`]
-
 |=======================================================================
 
 [float]
@@ -98,4 +90,3 @@ include::scripting/expression.asciidoc[]
 include::scripting/native.asciidoc[]
 
 include::scripting/advanced-scripting.asciidoc[]
-
diff --git a/docs/reference/modules/scripting/native.asciidoc b/docs/reference/modules/scripting/native.asciidoc
index 37a2eac18cc..ed81f44889b 100644
--- a/docs/reference/modules/scripting/native.asciidoc
+++ b/docs/reference/modules/scripting/native.asciidoc
@@ -13,8 +13,8 @@ to construct the script. The actual script will extend either
 `AbstractExecutableScript` or `AbstractSearchScript`. The second one is likely
 the most useful and has several helpful subclasses you can extend like
 `AbstractLongSearchScript` and `AbstractDoubleSearchScript`.
-Finally, your plugin should register the native
-script by declaring the `onModule(ScriptModule)` method.
+Finally, your plugin should register the native script by implementing the
+`ScriptPlugin` interface.
 
 If you squashed the whole thing into one class it'd look like:
 
diff --git a/docs/reference/modules/scripting/painless-syntax.asciidoc b/docs/reference/modules/scripting/painless-syntax.asciidoc
index fa8c1e60aa2..d89e79fc5d4 100644
--- a/docs/reference/modules/scripting/painless-syntax.asciidoc
+++ b/docs/reference/modules/scripting/painless-syntax.asciidoc
@@ -175,6 +175,21 @@ There are only a few minor differences and add-ons:
 * `=~` true if a portion of the text matches a pattern (e.g. `x =~ /b/`)
 * `==~` true if the entire text matches a pattern (e.g. `x ==~ /[Bb]ob/`)
 
+The `?:` (aka Elvis) operator coalesces null values. So `x ?: 0` is `0` if `x`
+is `null` and whatever value `x` has otherwise. It is a convenient way to write
+default values like `doc['x'].value ?: 0` which is 0 if `x` is not in the
+document being processed. It can also work with null safe dereferences to
+efficiently handle null in chains. For example,
+`doc['foo.keyword'].value?.length() ?: 0` is 0 if the document being processed
+doesn't have a `foo.keyword` field but is the length of that field if it does.
+Lastly, `?:` is lazy so the right hand side is not evaluated at all if the left
+hand side isn't null.
+
+NOTE: Unlike Groovy, Painless' `?:` operator only coalesces `null`, not `false`
+or http://groovy-lang.org/semantics.html#Groovy-Truth[falsy] values. Strictly
+speaking Painless' `?:` is more like Kotlin's `?:` than Groovy's `?:`.
+
+
 [float]
 [[painless-control-flow]]
 === Control flow
diff --git a/docs/reference/modules/scripting/security.asciidoc b/docs/reference/modules/scripting/security.asciidoc
index 4d35b0da250..cab7561d185 100644
--- a/docs/reference/modules/scripting/security.asciidoc
+++ b/docs/reference/modules/scripting/security.asciidoc
@@ -150,7 +150,7 @@ The benefit of doing this is that it severely limits the attack vectors
 available to a hacker.
 
 Restricting permissions is particularly important with scripting languages
-like Groovy and Javascript which are designed to do anything that can be done
+like Groovy which is designed to do anything that can be done
 in Java itself, including writing to the file system, opening sockets to
 remote servers, etc.
 
@@ -287,4 +287,3 @@ doing so.
 ======================================
 
 See http://docs.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html for more information.
-
diff --git a/docs/reference/query-dsl/geo-polygon-query.asciidoc b/docs/reference/query-dsl/geo-polygon-query.asciidoc
index 35278fda4a5..4f01da25482 100644
--- a/docs/reference/query-dsl/geo-polygon-query.asciidoc
+++ b/docs/reference/query-dsl/geo-polygon-query.asciidoc
@@ -69,7 +69,7 @@ GET /_search
                     "person.location" : {
                         "points" : [
                             [-70, 40],
-                        [-80, 30],
+                            [-80, 30],
                             [-90, 20]
                         ]
                     }
diff --git a/docs/reference/search/suggesters/phrase-suggest.asciidoc b/docs/reference/search/suggesters/phrase-suggest.asciidoc
index 6c502421e4e..3fce27c6d95 100644
--- a/docs/reference/search/suggesters/phrase-suggest.asciidoc
+++ b/docs/reference/search/suggesters/phrase-suggest.asciidoc
@@ -106,12 +106,7 @@ POST _suggest
 --------------------------------------------------
 // CONSOLE
 
-The response contains suggestions scored by the most likely spell
-correction first. In this case we received the expected correction
-`xorr the god jewel` first while the second correction is less
-conservative where only one of the errors is corrected. Note, the
-request is executed with `max_errors` set to `0.5` so 50% of the terms
-can contain misspellings (See parameter descriptions below).
+The response contains suggestions scored by the most likely spell correction first. In this case we received the expected correction "nobel prize".
 
 [source,js]
 --------------------------------------------------
@@ -320,7 +315,7 @@ The direct generators support the following parameters:
     filtered out using `confidence`. Three possible values can be specified:
     ** `missing`: Only generate suggestions for terms that are not in the
                  shard. This is the default.
-    ** `popular`: Only suggest terms that occur in more docs on the shard then
+    ** `popular`: Only suggest terms that occur in more docs on the shard than
                  the original term.
     ** `always`: Suggest any matching suggestions based on terms in the
                  suggest text.
diff --git a/docs/reference/search/validate.asciidoc b/docs/reference/search/validate.asciidoc
index 5b015f4e578..8b7b897934d 100644
--- a/docs/reference/search/validate.asciidoc
+++ b/docs/reference/search/validate.asciidoc
@@ -87,7 +87,7 @@ due to dynamic mapping, and 'foo' does not correctly parse into a date:
 
 [source,js]
 --------------------------------------------------
-GET twitter/tweet/_validate/query?q=post_date:foo
+GET twitter/tweet/_validate/query?q=post_date:foo%5d
 --------------------------------------------------
 // CONSOLE
 
@@ -102,7 +102,7 @@ about why a query failed:
 
 [source,js]
 --------------------------------------------------
-GET twitter/tweet/_validate/query?q=post_date:foo&explain=true
+GET twitter/tweet/_validate/query?q=post_date:foo%5d&explain=true
 --------------------------------------------------
 // CONSOLE
 
diff --git a/docs/reference/setup/important-settings.asciidoc b/docs/reference/setup/important-settings.asciidoc
index 63f988325a7..bdf7c314476 100644
--- a/docs/reference/setup/important-settings.asciidoc
+++ b/docs/reference/setup/important-settings.asciidoc
@@ -158,16 +158,15 @@ discovery.zen.ping.unicast.hosts:
 === `discovery.zen.minimum_master_nodes`
 
 To prevent data loss, it is vital to configure the
-`discovery.zen.minimum_master_nodes setting` so that each master-eligible node
+`discovery.zen.minimum_master_nodes` setting so that each master-eligible node
 knows the _minimum number of master-eligible nodes_ that must be visible in
 order to form a cluster.
 
 Without this setting, a cluster that suffers a network failure is at risk of
 having the cluster split into two independent clusters -- a split brain --
-which will lead to data loss.  A more detailed explanation is provided
+which will lead to data loss. A more detailed explanation is provided
 in <<split-brain>>.
 
-
 To avoid a split brain, this setting should be set to a _quorum_ of master-
 eligible nodes:
 
@@ -181,6 +180,3 @@ nodes should be set to `(3 / 2) + 1` or `2`:
 discovery.zen.minimum_master_nodes: 2
 --------------------------------------------------
 
-IMPORTANT: If `discovery.zen.minimum_master_nodes` is not set when
-Elasticsearch is running in <<dev-vs-prod,production mode>>, an exception will
-be thrown which will prevent the node from starting.
diff --git a/modules/lang-groovy/src/main/java/org/elasticsearch/script/groovy/GroovyScriptEngineService.java b/modules/lang-groovy/src/main/java/org/elasticsearch/script/groovy/GroovyScriptEngineService.java
index 0cd8976c76c..7ce05f82038 100644
--- a/modules/lang-groovy/src/main/java/org/elasticsearch/script/groovy/GroovyScriptEngineService.java
+++ b/modules/lang-groovy/src/main/java/org/elasticsearch/script/groovy/GroovyScriptEngineService.java
@@ -28,6 +28,7 @@ import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.apache.logging.log4j.util.Supplier;
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.search.Scorer;
+import org.codehaus.groovy.GroovyBugError;
 import org.codehaus.groovy.ast.ClassCodeExpressionTransformer;
 import org.codehaus.groovy.ast.ClassNode;
 import org.codehaus.groovy.ast.expr.ConstantExpression;
@@ -67,6 +68,7 @@ import java.security.AccessControlContext;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -302,20 +304,24 @@ public class GroovyScriptEngineService extends AbstractComponent implements Scri
                 // NOTE: we truncate the stack because IndyInterface has security issue (needs getClassLoader)
                 // we don't do a security check just as a tradeoff, it cannot really escalate to anything.
                 return AccessController.doPrivileged((PrivilegedAction<Object>) script::run);
-            } catch (AssertionError ae) {
+            } catch (final AssertionError ae) {
+                if (ae instanceof GroovyBugError) {
+                    // we encountered a bug in Groovy; we wrap this so it does not go to the uncaught exception handler and tear us down
+                    final String message =  "encountered bug in Groovy while executing script [" + compiledScript.name() + "]";
+                    throw new ScriptException(message, ae, Collections.emptyList(), compiledScript.toString(), compiledScript.lang());
+                }
                 // Groovy asserts are not java asserts, and cannot be disabled, so we do a best-effort trying to determine if this is a
                 // Groovy assert (in which case we wrap it and throw), or a real Java assert, in which case we rethrow it as-is, likely
                 // resulting in the uncaughtExceptionHandler handling it.
                 final StackTraceElement[] elements = ae.getStackTrace();
                 if (elements.length > 0 && "org.codehaus.groovy.runtime.InvokerHelper".equals(elements[0].getClassName())) {
-                    logger.trace((Supplier<?>) () -> new ParameterizedMessage("failed to run {}", compiledScript), ae);
-                    throw new ScriptException("Error evaluating " + compiledScript.name(),
-                            ae, emptyList(), "", compiledScript.lang());
+                    logger.debug((Supplier<?>) () -> new ParameterizedMessage("failed to run {}", compiledScript), ae);
+                    throw new ScriptException("error evaluating " + compiledScript.name(), ae, emptyList(), "", compiledScript.lang());
                 }
                 throw ae;
             } catch (Exception | NoClassDefFoundError e) {
                 logger.trace((Supplier<?>) () -> new ParameterizedMessage("failed to run {}", compiledScript), e);
-                throw new ScriptException("Error evaluating " + compiledScript.name(), e, emptyList(), "", compiledScript.lang());
+                throw new ScriptException("error evaluating " + compiledScript.name(), e, emptyList(), "", compiledScript.lang());
             }
         }
 
diff --git a/modules/lang-groovy/src/test/java/org/elasticsearch/script/groovy/GroovySecurityTests.java b/modules/lang-groovy/src/test/java/org/elasticsearch/script/groovy/GroovySecurityTests.java
index 1ac31a70589..ce3f6ea3c88 100644
--- a/modules/lang-groovy/src/test/java/org/elasticsearch/script/groovy/GroovySecurityTests.java
+++ b/modules/lang-groovy/src/test/java/org/elasticsearch/script/groovy/GroovySecurityTests.java
@@ -130,6 +130,14 @@ public class GroovySecurityTests extends ESTestCase {
         assertFailure("def foo=false; assert foo, \"msg2\";", NoClassDefFoundError.class);
     }
 
+    public void testGroovyBugError() {
+        // this script throws a GroovyBugError because our security manager permissions prevent Groovy from accessing this private field
+        // and Groovy does not handle it gracefully; this test will likely start failing if the bug is fixed upstream so that a
+        // GroovyBugError no longer surfaces here in which case the script should be replaced with another script that intentionally
+        // surfaces a GroovyBugError
+        assertFailure("[1, 2].size", AssertionError.class);
+    }
+
     /** runs a script */
     private void doTest(String script) {
         Map<String, Object> vars = new HashMap<String, Object>();
diff --git a/modules/lang-painless/src/main/antlr/PainlessLexer.g4 b/modules/lang-painless/src/main/antlr/PainlessLexer.g4
index 2f07c5f9a42..9504a3d911a 100644
--- a/modules/lang-painless/src/main/antlr/PainlessLexer.g4
+++ b/modules/lang-painless/src/main/antlr/PainlessLexer.g4
@@ -36,7 +36,8 @@ RP:        ')';
 // between shortcuts and decimal values.  Without the mode switch
 // shortcuts such as id.0.0 will fail because 0.0 will be interpreted
 // as a decimal value instead of two individual list-style shortcuts.
-DOT:       '.' -> mode(AFTER_DOT);
+DOT:       '.'  -> mode(AFTER_DOT);
+NSDOT:     '?.' -> mode(AFTER_DOT);
 COMMA:     ',';
 SEMICOLON: ';';
 IF:        'if';
@@ -80,6 +81,7 @@ BOOLAND: '&&';
 BOOLOR:  '||';
 COND:    '?';
 COLON:   ':';
+ELVIS:   '?:';
 REF:     '::';
 ARROW:   '->';
 FIND:    '=~';
diff --git a/modules/lang-painless/src/main/antlr/PainlessLexer.tokens b/modules/lang-painless/src/main/antlr/PainlessLexer.tokens
index dc62fe36b28..90422e09160 100644
--- a/modules/lang-painless/src/main/antlr/PainlessLexer.tokens
+++ b/modules/lang-painless/src/main/antlr/PainlessLexer.tokens
@@ -7,79 +7,81 @@ RBRACE=6
 LP=7
 RP=8
 DOT=9
-COMMA=10
-SEMICOLON=11
-IF=12
-IN=13
-ELSE=14
-WHILE=15
-DO=16
-FOR=17
-CONTINUE=18
-BREAK=19
-RETURN=20
-NEW=21
-TRY=22
-CATCH=23
-THROW=24
-THIS=25
-INSTANCEOF=26
-BOOLNOT=27
-BWNOT=28
-MUL=29
-DIV=30
-REM=31
-ADD=32
-SUB=33
-LSH=34
-RSH=35
-USH=36
-LT=37
-LTE=38
-GT=39
-GTE=40
-EQ=41
-EQR=42
-NE=43
-NER=44
-BWAND=45
-XOR=46
-BWOR=47
-BOOLAND=48
-BOOLOR=49
-COND=50
-COLON=51
-REF=52
-ARROW=53
-FIND=54
-MATCH=55
-INCR=56
-DECR=57
-ASSIGN=58
-AADD=59
-ASUB=60
-AMUL=61
-ADIV=62
-AREM=63
-AAND=64
-AXOR=65
-AOR=66
-ALSH=67
-ARSH=68
-AUSH=69
-OCTAL=70
-HEX=71
-INTEGER=72
-DECIMAL=73
-STRING=74
-REGEX=75
-TRUE=76
-FALSE=77
-NULL=78
-TYPE=79
-ID=80
-DOTINTEGER=81
-DOTID=82
+NSDOT=10
+COMMA=11
+SEMICOLON=12
+IF=13
+IN=14
+ELSE=15
+WHILE=16
+DO=17
+FOR=18
+CONTINUE=19
+BREAK=20
+RETURN=21
+NEW=22
+TRY=23
+CATCH=24
+THROW=25
+THIS=26
+INSTANCEOF=27
+BOOLNOT=28
+BWNOT=29
+MUL=30
+DIV=31
+REM=32
+ADD=33
+SUB=34
+LSH=35
+RSH=36
+USH=37
+LT=38
+LTE=39
+GT=40
+GTE=41
+EQ=42
+EQR=43
+NE=44
+NER=45
+BWAND=46
+XOR=47
+BWOR=48
+BOOLAND=49
+BOOLOR=50
+COND=51
+COLON=52
+ELVIS=53
+REF=54
+ARROW=55
+FIND=56
+MATCH=57
+INCR=58
+DECR=59
+ASSIGN=60
+AADD=61
+ASUB=62
+AMUL=63
+ADIV=64
+AREM=65
+AAND=66
+AXOR=67
+AOR=68
+ALSH=69
+ARSH=70
+AUSH=71
+OCTAL=72
+HEX=73
+INTEGER=74
+DECIMAL=75
+STRING=76
+REGEX=77
+TRUE=78
+FALSE=79
+NULL=80
+TYPE=81
+ID=82
+DOTINTEGER=83
+DOTID=84
 '{'=3
 '}'=4
 '['=5
@@ -87,66 +89,68 @@ DOTID=82
 '('=7
 ')'=8
 '.'=9
-','=10
-';'=11
-'if'=12
-'in'=13
-'else'=14
-'while'=15
-'do'=16
-'for'=17
-'continue'=18
-'break'=19
-'return'=20
-'new'=21
-'try'=22
-'catch'=23
-'throw'=24
-'this'=25
-'instanceof'=26
-'!'=27
-'~'=28
-'*'=29
-'/'=30
-'%'=31
-'+'=32
-'-'=33
-'<<'=34
-'>>'=35
-'>>>'=36
-'<'=37
-'<='=38
-'>'=39
-'>='=40
-'=='=41
-'==='=42
-'!='=43
-'!=='=44
-'&'=45
-'^'=46
-'|'=47
-'&&'=48
-'||'=49
-'?'=50
-':'=51
-'::'=52
-'->'=53
-'=~'=54
-'==~'=55
-'++'=56
-'--'=57
-'='=58
-'+='=59
-'-='=60
-'*='=61
-'/='=62
-'%='=63
-'&='=64
-'^='=65
-'|='=66
-'<<='=67
-'>>='=68
-'>>>='=69
-'true'=76
-'false'=77
-'null'=78
+'?.'=10
+','=11
+';'=12
+'if'=13
+'in'=14
+'else'=15
+'while'=16
+'do'=17
+'for'=18
+'continue'=19
+'break'=20
+'return'=21
+'new'=22
+'try'=23
+'catch'=24
+'throw'=25
+'this'=26
+'instanceof'=27
+'!'=28
+'~'=29
+'*'=30
+'/'=31
+'%'=32
+'+'=33
+'-'=34
+'<<'=35
+'>>'=36
+'>>>'=37
+'<'=38
+'<='=39
+'>'=40
+'>='=41
+'=='=42
+'==='=43
+'!='=44
+'!=='=45
+'&'=46
+'^'=47
+'|'=48
+'&&'=49
+'||'=50
+'?'=51
+':'=52
+'?:'=53
+'::'=54
+'->'=55
+'=~'=56
+'==~'=57
+'++'=58
+'--'=59
+'='=60
+'+='=61
+'-='=62
+'*='=63
+'/='=64
+'%='=65
+'&='=66
+'^='=67
+'|='=68
+'<<='=69
+'>>='=70
+'>>>='=71
+'true'=78
+'false'=79
+'null'=80
diff --git a/modules/lang-painless/src/main/antlr/PainlessParser.g4 b/modules/lang-painless/src/main/antlr/PainlessParser.g4
index cca96e65b8b..bfa4ee28dcc 100644
--- a/modules/lang-painless/src/main/antlr/PainlessParser.g4
+++ b/modules/lang-painless/src/main/antlr/PainlessParser.g4
@@ -110,6 +110,7 @@ expression
     |               expression BOOLAND expression                         # bool
     |               expression BOOLOR expression                          # bool
     | <assoc=right> expression COND expression COLON expression           # conditional
+    | <assoc=right> expression ELVIS expression                           # elvis
     | <assoc=right> expression ( ASSIGN | AADD | ASUB | AMUL |
                                  ADIV   | AREM | AAND | AXOR |
                                  AOR    | ALSH | ARSH | AUSH ) expression # assignment
@@ -156,11 +157,11 @@ postdot
     ;
 
 callinvoke
-    : COND? DOT DOTID arguments
+    : ( DOT | NSDOT ) DOTID arguments
     ;
 
 fieldaccess
-    : COND? DOT ( DOTID | DOTINTEGER )
+    : ( DOT | NSDOT ) ( DOTID | DOTINTEGER )
     ;
 
 braceaccess
diff --git a/modules/lang-painless/src/main/antlr/PainlessParser.tokens b/modules/lang-painless/src/main/antlr/PainlessParser.tokens
index dc62fe36b28..90422e09160 100644
--- a/modules/lang-painless/src/main/antlr/PainlessParser.tokens
+++ b/modules/lang-painless/src/main/antlr/PainlessParser.tokens
@@ -7,79 +7,81 @@ RBRACE=6
 LP=7
 RP=8
 DOT=9
-COMMA=10
-SEMICOLON=11
-IF=12
-IN=13
-ELSE=14
-WHILE=15
-DO=16
-FOR=17
-CONTINUE=18
-BREAK=19
-RETURN=20
-NEW=21
-TRY=22
-CATCH=23
-THROW=24
-THIS=25
-INSTANCEOF=26
-BOOLNOT=27
-BWNOT=28
-MUL=29
-DIV=30
-REM=31
-ADD=32
-SUB=33
-LSH=34
-RSH=35
-USH=36
-LT=37
-LTE=38
-GT=39
-GTE=40
-EQ=41
-EQR=42
-NE=43
-NER=44
-BWAND=45
-XOR=46
-BWOR=47
-BOOLAND=48
-BOOLOR=49
-COND=50
-COLON=51
-REF=52
-ARROW=53
-FIND=54
-MATCH=55
-INCR=56
-DECR=57
-ASSIGN=58
-AADD=59
-ASUB=60
-AMUL=61
-ADIV=62
-AREM=63
-AAND=64
-AXOR=65
-AOR=66
-ALSH=67
-ARSH=68
-AUSH=69
-OCTAL=70
-HEX=71
-INTEGER=72
-DECIMAL=73
-STRING=74
-REGEX=75
-TRUE=76
-FALSE=77
-NULL=78
-TYPE=79
-ID=80
-DOTINTEGER=81
-DOTID=82
+NSDOT=10
+COMMA=11
+SEMICOLON=12
+IF=13
+IN=14
+ELSE=15
+WHILE=16
+DO=17
+FOR=18
+CONTINUE=19
+BREAK=20
+RETURN=21
+NEW=22
+TRY=23
+CATCH=24
+THROW=25
+THIS=26
+INSTANCEOF=27
+BOOLNOT=28
+BWNOT=29
+MUL=30
+DIV=31
+REM=32
+ADD=33
+SUB=34
+LSH=35
+RSH=36
+USH=37
+LT=38
+LTE=39
+GT=40
+GTE=41
+EQ=42
+EQR=43
+NE=44
+NER=45
+BWAND=46
+XOR=47
+BWOR=48
+BOOLAND=49
+BOOLOR=50
+COND=51
+COLON=52
+ELVIS=53
+REF=54
+ARROW=55
+FIND=56
+MATCH=57
+INCR=58
+DECR=59
+ASSIGN=60
+AADD=61
+ASUB=62
+AMUL=63
+ADIV=64
+AREM=65
+AAND=66
+AXOR=67
+AOR=68
+ALSH=69
+ARSH=70
+AUSH=71
+OCTAL=72
+HEX=73
+INTEGER=74
+DECIMAL=75
+STRING=76
+REGEX=77
+TRUE=78
+FALSE=79
+NULL=80
+TYPE=81
+ID=82
+DOTINTEGER=83
+DOTID=84
 '{'=3
 '}'=4
 '['=5
@@ -87,66 +89,68 @@ DOTID=82
 '('=7
 ')'=8
 '.'=9
-','=10
-';'=11
-'if'=12
-'in'=13
-'else'=14
-'while'=15
-'do'=16
-'for'=17
-'continue'=18
-'break'=19
-'return'=20
-'new'=21
-'try'=22
-'catch'=23
-'throw'=24
-'this'=25
-'instanceof'=26
-'!'=27
-'~'=28
-'*'=29
-'/'=30
-'%'=31
-'+'=32
-'-'=33
-'<<'=34
-'>>'=35
-'>>>'=36
-'<'=37
-'<='=38
-'>'=39
-'>='=40
-'=='=41
-'==='=42
-'!='=43
-'!=='=44
-'&'=45
-'^'=46
-'|'=47
-'&&'=48
-'||'=49
-'?'=50
-':'=51
-'::'=52
-'->'=53
-'=~'=54
-'==~'=55
-'++'=56
-'--'=57
-'='=58
-'+='=59
-'-='=60
-'*='=61
-'/='=62
-'%='=63
-'&='=64
-'^='=65
-'|='=66
-'<<='=67
-'>>='=68
-'>>>='=69
-'true'=76
-'false'=77
-'null'=78
+'?.'=10
+','=11
+';'=12
+'if'=13
+'in'=14
+'else'=15
+'while'=16
+'do'=17
+'for'=18
+'continue'=19
+'break'=20
+'return'=21
+'new'=22
+'try'=23
+'catch'=24
+'throw'=25
+'this'=26
+'instanceof'=27
+'!'=28
+'~'=29
+'*'=30
+'/'=31
+'%'=32
+'+'=33
+'-'=34
+'<<'=35
+'>>'=36
+'>>>'=37
+'<'=38
+'<='=39
+'>'=40
+'>='=41
+'=='=42
+'==='=43
+'!='=44
+'!=='=45
+'&'=46
+'^'=47
+'|'=48
+'&&'=49
+'||'=50
+'?'=51
+':'=52
+'?:'=53
+'::'=54
+'->'=55
+'=~'=56
+'==~'=57
+'++'=58
+'--'=59
+'='=60
+'+='=61
+'-='=62
+'*='=63
+'/='=64
+'%='=65
+'&='=66
+'^='=67
+'|='=68
+'<<='=69
+'>>='=70
+'>>>='=71
+'true'=78
+'false'=79
+'null'=80
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/Locals.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/Locals.java
index b02ea085904..5588c943dd2 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/Locals.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/Locals.java
@@ -36,7 +36,7 @@ import java.util.Set;
  * Tracks user defined methods and variables across compilation phases.
  */
 public final class Locals {
-    
+
     /** Reserved word: params map parameter */
     public static final String PARAMS = "params";
     /** Reserved word: Lucene scorer parameter */
@@ -53,25 +53,35 @@ public final class Locals {
     public static final String THIS   = "#this";
     /** Reserved word: unused */
     public static final String DOC    = "doc";
-    
-    /** Map of always reserved keywords */
-    public static final Set<String> KEYWORDS = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
-            THIS,PARAMS,SCORER,DOC,VALUE,SCORE,CTX,LOOP
+
+    /** Map of always reserved keywords for the main scope */
+    public static final Set<String> MAIN_KEYWORDS = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
+        THIS,PARAMS,SCORER,DOC,VALUE,SCORE,CTX,LOOP
     )));
-    
+
+    /** Map of always reserved keywords for a function scope */
+    public static final Set<String> FUNCTION_KEYWORDS = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
+        THIS,LOOP
+    )));
+
+    /** Map of always reserved keywords for a lambda scope */
+    public static final Set<String> LAMBDA_KEYWORDS = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
+        THIS,LOOP
+    )));
+
     /** Creates a new local variable scope (e.g. loop) inside the current scope */
     public static Locals newLocalScope(Locals currentScope) {
         return new Locals(currentScope);
     }
-    
-    /** 
+
+    /**
      * Creates a new lambda scope inside the current scope
      * <p>
      * This is just like {@link #newFunctionScope}, except the captured parameters are made read-only.
      */
-    public static Locals newLambdaScope(Locals programScope, Type returnType, List<Parameter> parameters, 
+    public static Locals newLambdaScope(Locals programScope, Type returnType, List<Parameter> parameters,
                                         int captureCount, int maxLoopCounter) {
-        Locals locals = new Locals(programScope, returnType);
+        Locals locals = new Locals(programScope, returnType, LAMBDA_KEYWORDS);
         for (int i = 0; i < parameters.size(); i++) {
             Parameter parameter = parameters.get(i);
             // TODO: allow non-captures to be r/w:
@@ -87,10 +97,10 @@ public final class Locals {
         }
         return locals;
     }
-    
+
     /** Creates a new function scope inside the current scope */
     public static Locals newFunctionScope(Locals programScope, Type returnType, List<Parameter> parameters, int maxLoopCounter) {
-        Locals locals = new Locals(programScope, returnType);
+        Locals locals = new Locals(programScope, returnType, FUNCTION_KEYWORDS);
         for (Parameter parameter : parameters) {
             locals.addVariable(parameter.location, parameter.type, parameter.name, false);
         }
@@ -100,10 +110,10 @@ public final class Locals {
         }
         return locals;
     }
-    
+
     /** Creates a new main method scope */
     public static Locals newMainMethodScope(Locals programScope, boolean usesScore, boolean usesCtx, int maxLoopCounter) {
-        Locals locals = new Locals(programScope, Definition.OBJECT_TYPE);
+        Locals locals = new Locals(programScope, Definition.OBJECT_TYPE, MAIN_KEYWORDS);
         // This reference.  Internal use only.
         locals.defineVariable(null, Definition.getType("Object"), THIS, true);
 
@@ -137,16 +147,16 @@ public final class Locals {
         }
         return locals;
     }
-    
+
     /** Creates a new program scope: the list of methods. It is the parent for all methods */
     public static Locals newProgramScope(Collection<Method> methods) {
-        Locals locals = new Locals(null, null);
+        Locals locals = new Locals(null, null, null);
         for (Method method : methods) {
             locals.addMethod(method);
         }
         return locals;
     }
-    
+
     /** Checks if a variable exists or not, in this scope or any parents. */
     public boolean hasVariable(String name) {
         Variable variable = lookupVariable(null, name);
@@ -158,7 +168,7 @@ public final class Locals {
         }
         return false;
     }
-    
+
     /** Accesses a variable. This will throw IAE if the variable does not exist */
     public Variable getVariable(Location location, String name) {
         Variable variable = lookupVariable(location, name);
@@ -170,7 +180,7 @@ public final class Locals {
         }
         throw location.createError(new IllegalArgumentException("Variable [" + name + "] is not defined."));
     }
-    
+
     /** Looks up a method. Returns null if the method does not exist. */
     public Method getMethod(MethodKey key) {
         Method method = lookupMethod(key);
@@ -182,23 +192,23 @@ public final class Locals {
         }
         return null;
     }
-    
+
     /** Creates a new variable. Throws IAE if the variable has already been defined (even in a parent) or reserved. */
     public Variable addVariable(Location location, Type type, String name, boolean readonly) {
         if (hasVariable(name)) {
             throw location.createError(new IllegalArgumentException("Variable [" + name + "] is already defined."));
         }
-        if (KEYWORDS.contains(name)) {
+        if (keywords.contains(name)) {
             throw location.createError(new IllegalArgumentException("Variable [" + name + "] is reserved."));
         }
         return defineVariable(location, type, name, readonly);
     }
-    
+
     /** Return type of this scope (e.g. int, if inside a function that returns int) */
     public Type getReturnType() {
         return returnType;
     }
-    
+
     /** Returns the top-level program scope. */
     public Locals getProgramScope() {
         Locals locals = this;
@@ -207,13 +217,15 @@ public final class Locals {
         }
         return locals;
     }
-    
+
     ///// private impl
 
     // parent scope
     private final Locals parent;
     // return type of this scope
     private final Type returnType;
+    // keywords for this scope
+    private final Set<String> keywords;
     // next slot number to assign
     private int nextSlotNumber;
     // variable name -> variable
@@ -225,15 +237,16 @@ public final class Locals {
      * Create a new Locals
      */
     private Locals(Locals parent) {
-        this(parent, parent.getReturnType());
+        this(parent, parent.returnType, parent.keywords);
     }
-    
+
     /**
      * Create a new Locals with specified return type
      */
-    private Locals(Locals parent, Type returnType) {
+    private Locals(Locals parent, Type returnType, Set<String> keywords) {
         this.parent = parent;
         this.returnType = returnType;
+        this.keywords = keywords;
         if (parent == null) {
             this.nextSlotNumber = 0;
         } else {
@@ -262,7 +275,7 @@ public final class Locals {
         return methods.get(key);
     }
 
-    
+
     /** Defines a variable at this scope internally. */
     private Variable defineVariable(Location location, Type type, String name, boolean readonly) {
         if (variables == null) {
@@ -273,7 +286,7 @@ public final class Locals {
         nextSlotNumber += type.type.getSize();
         return variable;
     }
-    
+
     private void addMethod(Method method) {
         if (methods == null) {
             methods = new HashMap<>();
@@ -293,7 +306,7 @@ public final class Locals {
         public final Type type;
         public final boolean readonly;
         private final int slot;
-        
+
         public Variable(Location location, String name, Type type, int slot, boolean readonly) {
             this.location = location;
             this.name = name;
@@ -301,12 +314,12 @@ public final class Locals {
             this.slot = slot;
             this.readonly = readonly;
         }
-        
+
         public int getSlot() {
             return slot;
         }
     }
-    
+
     public static final class Parameter {
         public final Location location;
         public final String name;
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/Operation.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/Operation.java
index e32a77022f6..828e26e56b4 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/Operation.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/Operation.java
@@ -27,7 +27,7 @@ package org.elasticsearch.painless;
  */
 public enum Operation {
 
-    MUL     ( "+"   ),
+    MUL     ( "*"   ),
     DIV     ( "/"   ),
     REM     ( "%"   ),
     ADD     ( "+"   ),
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessLexer.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessLexer.java
index 54e164c37c3..529ae6f89ea 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessLexer.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessLexer.java
@@ -21,16 +21,16 @@ class PainlessLexer extends Lexer {
     new PredictionContextCache();
   public static final int
     WS=1, COMMENT=2, LBRACK=3, RBRACK=4, LBRACE=5, RBRACE=6, LP=7, RP=8, DOT=9, 
-    COMMA=10, SEMICOLON=11, IF=12, IN=13, ELSE=14, WHILE=15, DO=16, FOR=17, 
-    CONTINUE=18, BREAK=19, RETURN=20, NEW=21, TRY=22, CATCH=23, THROW=24, 
-    THIS=25, INSTANCEOF=26, BOOLNOT=27, BWNOT=28, MUL=29, DIV=30, REM=31, 
-    ADD=32, SUB=33, LSH=34, RSH=35, USH=36, LT=37, LTE=38, GT=39, GTE=40, 
-    EQ=41, EQR=42, NE=43, NER=44, BWAND=45, XOR=46, BWOR=47, BOOLAND=48, BOOLOR=49, 
-    COND=50, COLON=51, REF=52, ARROW=53, FIND=54, MATCH=55, INCR=56, DECR=57, 
-    ASSIGN=58, AADD=59, ASUB=60, AMUL=61, ADIV=62, AREM=63, AAND=64, AXOR=65, 
-    AOR=66, ALSH=67, ARSH=68, AUSH=69, OCTAL=70, HEX=71, INTEGER=72, DECIMAL=73, 
-    STRING=74, REGEX=75, TRUE=76, FALSE=77, NULL=78, TYPE=79, ID=80, DOTINTEGER=81, 
-    DOTID=82;
+    NSDOT=10, COMMA=11, SEMICOLON=12, IF=13, IN=14, ELSE=15, WHILE=16, DO=17, 
+    FOR=18, CONTINUE=19, BREAK=20, RETURN=21, NEW=22, TRY=23, CATCH=24, THROW=25, 
+    THIS=26, INSTANCEOF=27, BOOLNOT=28, BWNOT=29, MUL=30, DIV=31, REM=32, 
+    ADD=33, SUB=34, LSH=35, RSH=36, USH=37, LT=38, LTE=39, GT=40, GTE=41, 
+    EQ=42, EQR=43, NE=44, NER=45, BWAND=46, XOR=47, BWOR=48, BOOLAND=49, BOOLOR=50, 
+    COND=51, COLON=52, ELVIS=53, REF=54, ARROW=55, FIND=56, MATCH=57, INCR=58, 
+    DECR=59, ASSIGN=60, AADD=61, ASUB=62, AMUL=63, ADIV=64, AREM=65, AAND=66, 
+    AXOR=67, AOR=68, ALSH=69, ARSH=70, AUSH=71, OCTAL=72, HEX=73, INTEGER=74, 
+    DECIMAL=75, STRING=76, REGEX=77, TRUE=78, FALSE=79, NULL=80, TYPE=81, 
+    ID=82, DOTINTEGER=83, DOTID=84;
   public static final int AFTER_DOT = 1;
   public static String[] modeNames = {
     "DEFAULT_MODE", "AFTER_DOT"
@@ -38,39 +38,39 @@ class PainlessLexer extends Lexer {
 
   public static final String[] ruleNames = {
     "WS", "COMMENT", "LBRACK", "RBRACK", "LBRACE", "RBRACE", "LP", "RP", "DOT", 
-    "COMMA", "SEMICOLON", "IF", "IN", "ELSE", "WHILE", "DO", "FOR", "CONTINUE", 
-    "BREAK", "RETURN", "NEW", "TRY", "CATCH", "THROW", "THIS", "INSTANCEOF", 
-    "BOOLNOT", "BWNOT", "MUL", "DIV", "REM", "ADD", "SUB", "LSH", "RSH", "USH", 
-    "LT", "LTE", "GT", "GTE", "EQ", "EQR", "NE", "NER", "BWAND", "XOR", "BWOR", 
-    "BOOLAND", "BOOLOR", "COND", "COLON", "REF", "ARROW", "FIND", "MATCH", 
-    "INCR", "DECR", "ASSIGN", "AADD", "ASUB", "AMUL", "ADIV", "AREM", "AAND", 
-    "AXOR", "AOR", "ALSH", "ARSH", "AUSH", "OCTAL", "HEX", "INTEGER", "DECIMAL", 
-    "STRING", "REGEX", "TRUE", "FALSE", "NULL", "TYPE", "ID", "DOTINTEGER", 
-    "DOTID"
-  };
-
-  private static final String[] _LITERAL_NAMES = {
-    null, null, null, "'{'", "'}'", "'['", "']'", "'('", "')'", "'.'", "','", 
-    "';'", "'if'", "'in'", "'else'", "'while'", "'do'", "'for'", "'continue'", 
-    "'break'", "'return'", "'new'", "'try'", "'catch'", "'throw'", "'this'", 
-    "'instanceof'", "'!'", "'~'", "'*'", "'/'", "'%'", "'+'", "'-'", "'<<'", 
-    "'>>'", "'>>>'", "'<'", "'<='", "'>'", "'>='", "'=='", "'==='", "'!='", 
-    "'!=='", "'&'", "'^'", "'|'", "'&&'", "'||'", "'?'", "':'", "'::'", "'->'", 
-    "'=~'", "'==~'", "'++'", "'--'", "'='", "'+='", "'-='", "'*='", "'/='", 
-    "'%='", "'&='", "'^='", "'|='", "'<<='", "'>>='", "'>>>='", null, null, 
-    null, null, null, null, "'true'", "'false'", "'null'"
-  };
-  private static final String[] _SYMBOLIC_NAMES = {
-    null, "WS", "COMMENT", "LBRACK", "RBRACK", "LBRACE", "RBRACE", "LP", "RP", 
-    "DOT", "COMMA", "SEMICOLON", "IF", "IN", "ELSE", "WHILE", "DO", "FOR", 
+    "NSDOT", "COMMA", "SEMICOLON", "IF", "IN", "ELSE", "WHILE", "DO", "FOR", 
     "CONTINUE", "BREAK", "RETURN", "NEW", "TRY", "CATCH", "THROW", "THIS", 
     "INSTANCEOF", "BOOLNOT", "BWNOT", "MUL", "DIV", "REM", "ADD", "SUB", "LSH", 
     "RSH", "USH", "LT", "LTE", "GT", "GTE", "EQ", "EQR", "NE", "NER", "BWAND", 
-    "XOR", "BWOR", "BOOLAND", "BOOLOR", "COND", "COLON", "REF", "ARROW", "FIND", 
-    "MATCH", "INCR", "DECR", "ASSIGN", "AADD", "ASUB", "AMUL", "ADIV", "AREM", 
-    "AAND", "AXOR", "AOR", "ALSH", "ARSH", "AUSH", "OCTAL", "HEX", "INTEGER", 
-    "DECIMAL", "STRING", "REGEX", "TRUE", "FALSE", "NULL", "TYPE", "ID", "DOTINTEGER", 
-    "DOTID"
+    "XOR", "BWOR", "BOOLAND", "BOOLOR", "COND", "COLON", "ELVIS", "REF", "ARROW", 
+    "FIND", "MATCH", "INCR", "DECR", "ASSIGN", "AADD", "ASUB", "AMUL", "ADIV", 
+    "AREM", "AAND", "AXOR", "AOR", "ALSH", "ARSH", "AUSH", "OCTAL", "HEX", 
+    "INTEGER", "DECIMAL", "STRING", "REGEX", "TRUE", "FALSE", "NULL", "TYPE", 
+    "ID", "DOTINTEGER", "DOTID"
+  };
+
+  private static final String[] _LITERAL_NAMES = {
+    null, null, null, "'{'", "'}'", "'['", "']'", "'('", "')'", "'.'", "'?.'", 
+    "','", "';'", "'if'", "'in'", "'else'", "'while'", "'do'", "'for'", "'continue'", 
+    "'break'", "'return'", "'new'", "'try'", "'catch'", "'throw'", "'this'", 
+    "'instanceof'", "'!'", "'~'", "'*'", "'/'", "'%'", "'+'", "'-'", "'<<'", 
+    "'>>'", "'>>>'", "'<'", "'<='", "'>'", "'>='", "'=='", "'==='", "'!='", 
+    "'!=='", "'&'", "'^'", "'|'", "'&&'", "'||'", "'?'", "':'", "'?:'", "'::'", 
+    "'->'", "'=~'", "'==~'", "'++'", "'--'", "'='", "'+='", "'-='", "'*='", 
+    "'/='", "'%='", "'&='", "'^='", "'|='", "'<<='", "'>>='", "'>>>='", null, 
+    null, null, null, null, null, "'true'", "'false'", "'null'"
+  };
+  private static final String[] _SYMBOLIC_NAMES = {
+    null, "WS", "COMMENT", "LBRACK", "RBRACK", "LBRACE", "RBRACE", "LP", "RP", 
+    "DOT", "NSDOT", "COMMA", "SEMICOLON", "IF", "IN", "ELSE", "WHILE", "DO", 
+    "FOR", "CONTINUE", "BREAK", "RETURN", "NEW", "TRY", "CATCH", "THROW", 
+    "THIS", "INSTANCEOF", "BOOLNOT", "BWNOT", "MUL", "DIV", "REM", "ADD", 
+    "SUB", "LSH", "RSH", "USH", "LT", "LTE", "GT", "GTE", "EQ", "EQR", "NE", 
+    "NER", "BWAND", "XOR", "BWOR", "BOOLAND", "BOOLOR", "COND", "COLON", "ELVIS", 
+    "REF", "ARROW", "FIND", "MATCH", "INCR", "DECR", "ASSIGN", "AADD", "ASUB", 
+    "AMUL", "ADIV", "AREM", "AAND", "AXOR", "AOR", "ALSH", "ARSH", "AUSH", 
+    "OCTAL", "HEX", "INTEGER", "DECIMAL", "STRING", "REGEX", "TRUE", "FALSE", 
+    "NULL", "TYPE", "ID", "DOTINTEGER", "DOTID"
   };
   public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
 
@@ -129,11 +129,11 @@ class PainlessLexer extends Lexer {
   @Override
   public boolean sempred(RuleContext _localctx, int ruleIndex, int predIndex) {
     switch (ruleIndex) {
-    case 29:
+    case 30:
       return DIV_sempred((RuleContext)_localctx, predIndex);
-    case 74:
+    case 76:
       return REGEX_sempred((RuleContext)_localctx, predIndex);
-    case 78:
+    case 80:
       return TYPE_sempred((RuleContext)_localctx, predIndex);
     }
     return true;
@@ -161,7 +161,7 @@ class PainlessLexer extends Lexer {
   }
 
   public static final String _serializedATN =
-    "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\2T\u024b\b\1\b\1\4"+
+    "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\2V\u0257\b\1\b\1\4"+
     "\2\t\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n"+
     "\4\13\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22"+
     "\t\22\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31"+
@@ -170,202 +170,206 @@ class PainlessLexer extends Lexer {
     "+\4,\t,\4-\t-\4.\t.\4/\t/\4\60\t\60\4\61\t\61\4\62\t\62\4\63\t\63\4\64"+
     "\t\64\4\65\t\65\4\66\t\66\4\67\t\67\48\t8\49\t9\4:\t:\4;\t;\4<\t<\4=\t"+
     "=\4>\t>\4?\t?\4@\t@\4A\tA\4B\tB\4C\tC\4D\tD\4E\tE\4F\tF\4G\tG\4H\tH\4"+
-    "I\tI\4J\tJ\4K\tK\4L\tL\4M\tM\4N\tN\4O\tO\4P\tP\4Q\tQ\4R\tR\4S\tS\3\2\6"+
-    "\2\u00aa\n\2\r\2\16\2\u00ab\3\2\3\2\3\3\3\3\3\3\3\3\7\3\u00b4\n\3\f\3"+
-    "\16\3\u00b7\13\3\3\3\3\3\3\3\3\3\3\3\7\3\u00be\n\3\f\3\16\3\u00c1\13\3"+
-    "\3\3\3\3\5\3\u00c5\n\3\3\3\3\3\3\4\3\4\3\5\3\5\3\6\3\6\3\7\3\7\3\b\3\b"+
-    "\3\t\3\t\3\n\3\n\3\n\3\n\3\13\3\13\3\f\3\f\3\r\3\r\3\r\3\16\3\16\3\16"+
-    "\3\17\3\17\3\17\3\17\3\17\3\20\3\20\3\20\3\20\3\20\3\20\3\21\3\21\3\21"+
-    "\3\22\3\22\3\22\3\22\3\23\3\23\3\23\3\23\3\23\3\23\3\23\3\23\3\23\3\24"+
-    "\3\24\3\24\3\24\3\24\3\24\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3\26\3\26"+
-    "\3\26\3\26\3\27\3\27\3\27\3\27\3\30\3\30\3\30\3\30\3\30\3\30\3\31\3\31"+
-    "\3\31\3\31\3\31\3\31\3\32\3\32\3\32\3\32\3\32\3\33\3\33\3\33\3\33\3\33"+
-    "\3\33\3\33\3\33\3\33\3\33\3\33\3\34\3\34\3\35\3\35\3\36\3\36\3\37\3\37"+
-    "\3\37\3 \3 \3!\3!\3\"\3\"\3#\3#\3#\3$\3$\3$\3%\3%\3%\3%\3&\3&\3\'\3\'"+
-    "\3\'\3(\3(\3)\3)\3)\3*\3*\3*\3+\3+\3+\3+\3,\3,\3,\3-\3-\3-\3-\3.\3.\3"+
-    "/\3/\3\60\3\60\3\61\3\61\3\61\3\62\3\62\3\62\3\63\3\63\3\64\3\64\3\65"+
-    "\3\65\3\65\3\66\3\66\3\66\3\67\3\67\3\67\38\38\38\38\39\39\39\3:\3:\3"+
-    ":\3;\3;\3<\3<\3<\3=\3=\3=\3>\3>\3>\3?\3?\3?\3@\3@\3@\3A\3A\3A\3B\3B\3"+
-    "B\3C\3C\3C\3D\3D\3D\3D\3E\3E\3E\3E\3F\3F\3F\3F\3F\3G\3G\6G\u01ac\nG\r"+
-    "G\16G\u01ad\3G\5G\u01b1\nG\3H\3H\3H\6H\u01b6\nH\rH\16H\u01b7\3H\5H\u01bb"+
-    "\nH\3I\3I\3I\7I\u01c0\nI\fI\16I\u01c3\13I\5I\u01c5\nI\3I\5I\u01c8\nI\3"+
-    "J\3J\3J\7J\u01cd\nJ\fJ\16J\u01d0\13J\5J\u01d2\nJ\3J\3J\6J\u01d6\nJ\rJ"+
-    "\16J\u01d7\5J\u01da\nJ\3J\3J\5J\u01de\nJ\3J\6J\u01e1\nJ\rJ\16J\u01e2\5"+
-    "J\u01e5\nJ\3J\5J\u01e8\nJ\3K\3K\3K\3K\3K\3K\7K\u01f0\nK\fK\16K\u01f3\13"+
-    "K\3K\3K\3K\3K\3K\3K\3K\7K\u01fc\nK\fK\16K\u01ff\13K\3K\5K\u0202\nK\3L"+
-    "\3L\3L\3L\6L\u0208\nL\rL\16L\u0209\3L\3L\7L\u020e\nL\fL\16L\u0211\13L"+
-    "\3L\3L\3M\3M\3M\3M\3M\3N\3N\3N\3N\3N\3N\3O\3O\3O\3O\3O\3P\3P\3P\3P\7P"+
-    "\u0229\nP\fP\16P\u022c\13P\3P\3P\3Q\3Q\7Q\u0232\nQ\fQ\16Q\u0235\13Q\3"+
-    "R\3R\3R\7R\u023a\nR\fR\16R\u023d\13R\5R\u023f\nR\3R\3R\3S\3S\7S\u0245"+
-    "\nS\fS\16S\u0248\13S\3S\3S\6\u00b5\u00bf\u01f1\u01fd\2T\4\3\6\4\b\5\n"+
-    "\6\f\7\16\b\20\t\22\n\24\13\26\f\30\r\32\16\34\17\36\20 \21\"\22$\23&"+
-    "\24(\25*\26,\27.\30\60\31\62\32\64\33\66\348\35:\36<\37> @!B\"D#F$H%J"+
-    "&L\'N(P)R*T+V,X-Z.\\/^\60`\61b\62d\63f\64h\65j\66l\67n8p9r:t;v<x=z>|?"+
-    "~@\u0080A\u0082B\u0084C\u0086D\u0088E\u008aF\u008cG\u008eH\u0090I\u0092"+
-    "J\u0094K\u0096L\u0098M\u009aN\u009cO\u009eP\u00a0Q\u00a2R\u00a4S\u00a6"+
-    "T\4\2\3\24\5\2\13\f\17\17\"\"\4\2\f\f\17\17\3\2\629\4\2NNnn\4\2ZZzz\5"+
-    "\2\62;CHch\3\2\63;\3\2\62;\b\2FFHHNNffhhnn\4\2GGgg\4\2--//\6\2FFHHffh"+
-    "h\4\2$$^^\4\2\f\f\61\61\3\2\f\f\t\2WWeekknouuwwzz\5\2C\\aac|\6\2\62;C"+
-    "\\aac|\u026b\2\4\3\2\2\2\2\6\3\2\2\2\2\b\3\2\2\2\2\n\3\2\2\2\2\f\3\2\2"+
-    "\2\2\16\3\2\2\2\2\20\3\2\2\2\2\22\3\2\2\2\2\24\3\2\2\2\2\26\3\2\2\2\2"+
-    "\30\3\2\2\2\2\32\3\2\2\2\2\34\3\2\2\2\2\36\3\2\2\2\2 \3\2\2\2\2\"\3\2"+
-    "\2\2\2$\3\2\2\2\2&\3\2\2\2\2(\3\2\2\2\2*\3\2\2\2\2,\3\2\2\2\2.\3\2\2\2"+
-    "\2\60\3\2\2\2\2\62\3\2\2\2\2\64\3\2\2\2\2\66\3\2\2\2\28\3\2\2\2\2:\3\2"+
-    "\2\2\2<\3\2\2\2\2>\3\2\2\2\2@\3\2\2\2\2B\3\2\2\2\2D\3\2\2\2\2F\3\2\2\2"+
-    "\2H\3\2\2\2\2J\3\2\2\2\2L\3\2\2\2\2N\3\2\2\2\2P\3\2\2\2\2R\3\2\2\2\2T"+
-    "\3\2\2\2\2V\3\2\2\2\2X\3\2\2\2\2Z\3\2\2\2\2\\\3\2\2\2\2^\3\2\2\2\2`\3"+
-    "\2\2\2\2b\3\2\2\2\2d\3\2\2\2\2f\3\2\2\2\2h\3\2\2\2\2j\3\2\2\2\2l\3\2\2"+
-    "\2\2n\3\2\2\2\2p\3\2\2\2\2r\3\2\2\2\2t\3\2\2\2\2v\3\2\2\2\2x\3\2\2\2\2"+
-    "z\3\2\2\2\2|\3\2\2\2\2~\3\2\2\2\2\u0080\3\2\2\2\2\u0082\3\2\2\2\2\u0084"+
-    "\3\2\2\2\2\u0086\3\2\2\2\2\u0088\3\2\2\2\2\u008a\3\2\2\2\2\u008c\3\2\2"+
-    "\2\2\u008e\3\2\2\2\2\u0090\3\2\2\2\2\u0092\3\2\2\2\2\u0094\3\2\2\2\2\u0096"+
-    "\3\2\2\2\2\u0098\3\2\2\2\2\u009a\3\2\2\2\2\u009c\3\2\2\2\2\u009e\3\2\2"+
-    "\2\2\u00a0\3\2\2\2\2\u00a2\3\2\2\2\3\u00a4\3\2\2\2\3\u00a6\3\2\2\2\4\u00a9"+
-    "\3\2\2\2\6\u00c4\3\2\2\2\b\u00c8\3\2\2\2\n\u00ca\3\2\2\2\f\u00cc\3\2\2"+
-    "\2\16\u00ce\3\2\2\2\20\u00d0\3\2\2\2\22\u00d2\3\2\2\2\24\u00d4\3\2\2\2"+
-    "\26\u00d8\3\2\2\2\30\u00da\3\2\2\2\32\u00dc\3\2\2\2\34\u00df\3\2\2\2\36"+
-    "\u00e2\3\2\2\2 \u00e7\3\2\2\2\"\u00ed\3\2\2\2$\u00f0\3\2\2\2&\u00f4\3"+
-    "\2\2\2(\u00fd\3\2\2\2*\u0103\3\2\2\2,\u010a\3\2\2\2.\u010e\3\2\2\2\60"+
-    "\u0112\3\2\2\2\62\u0118\3\2\2\2\64\u011e\3\2\2\2\66\u0123\3\2\2\28\u012e"+
-    "\3\2\2\2:\u0130\3\2\2\2<\u0132\3\2\2\2>\u0134\3\2\2\2@\u0137\3\2\2\2B"+
-    "\u0139\3\2\2\2D\u013b\3\2\2\2F\u013d\3\2\2\2H\u0140\3\2\2\2J\u0143\3\2"+
-    "\2\2L\u0147\3\2\2\2N\u0149\3\2\2\2P\u014c\3\2\2\2R\u014e\3\2\2\2T\u0151"+
-    "\3\2\2\2V\u0154\3\2\2\2X\u0158\3\2\2\2Z\u015b\3\2\2\2\\\u015f\3\2\2\2"+
-    "^\u0161\3\2\2\2`\u0163\3\2\2\2b\u0165\3\2\2\2d\u0168\3\2\2\2f\u016b\3"+
-    "\2\2\2h\u016d\3\2\2\2j\u016f\3\2\2\2l\u0172\3\2\2\2n\u0175\3\2\2\2p\u0178"+
-    "\3\2\2\2r\u017c\3\2\2\2t\u017f\3\2\2\2v\u0182\3\2\2\2x\u0184\3\2\2\2z"+
-    "\u0187\3\2\2\2|\u018a\3\2\2\2~\u018d\3\2\2\2\u0080\u0190\3\2\2\2\u0082"+
-    "\u0193\3\2\2\2\u0084\u0196\3\2\2\2\u0086\u0199\3\2\2\2\u0088\u019c\3\2"+
-    "\2\2\u008a\u01a0\3\2\2\2\u008c\u01a4\3\2\2\2\u008e\u01a9\3\2\2\2\u0090"+
-    "\u01b2\3\2\2\2\u0092\u01c4\3\2\2\2\u0094\u01d1\3\2\2\2\u0096\u0201\3\2"+
-    "\2\2\u0098\u0203\3\2\2\2\u009a\u0214\3\2\2\2\u009c\u0219\3\2\2\2\u009e"+
-    "\u021f\3\2\2\2\u00a0\u0224\3\2\2\2\u00a2\u022f\3\2\2\2\u00a4\u023e\3\2"+
-    "\2\2\u00a6\u0242\3\2\2\2\u00a8\u00aa\t\2\2\2\u00a9\u00a8\3\2\2\2\u00aa"+
-    "\u00ab\3\2\2\2\u00ab\u00a9\3\2\2\2\u00ab\u00ac\3\2\2\2\u00ac\u00ad\3\2"+
-    "\2\2\u00ad\u00ae\b\2\2\2\u00ae\5\3\2\2\2\u00af\u00b0\7\61\2\2\u00b0\u00b1"+
-    "\7\61\2\2\u00b1\u00b5\3\2\2\2\u00b2\u00b4\13\2\2\2\u00b3\u00b2\3\2\2\2"+
-    "\u00b4\u00b7\3\2\2\2\u00b5\u00b6\3\2\2\2\u00b5\u00b3\3\2\2\2\u00b6\u00b8"+
-    "\3\2\2\2\u00b7\u00b5\3\2\2\2\u00b8\u00c5\t\3\2\2\u00b9\u00ba\7\61\2\2"+
-    "\u00ba\u00bb\7,\2\2\u00bb\u00bf\3\2\2\2\u00bc\u00be\13\2\2\2\u00bd\u00bc"+
-    "\3\2\2\2\u00be\u00c1\3\2\2\2\u00bf\u00c0\3\2\2\2\u00bf\u00bd\3\2\2\2\u00c0"+
-    "\u00c2\3\2\2\2\u00c1\u00bf\3\2\2\2\u00c2\u00c3\7,\2\2\u00c3\u00c5\7\61"+
-    "\2\2\u00c4\u00af\3\2\2\2\u00c4\u00b9\3\2\2\2\u00c5\u00c6\3\2\2\2\u00c6"+
-    "\u00c7\b\3\2\2\u00c7\7\3\2\2\2\u00c8\u00c9\7}\2\2\u00c9\t\3\2\2\2\u00ca"+
-    "\u00cb\7\177\2\2\u00cb\13\3\2\2\2\u00cc\u00cd\7]\2\2\u00cd\r\3\2\2\2\u00ce"+
-    "\u00cf\7_\2\2\u00cf\17\3\2\2\2\u00d0\u00d1\7*\2\2\u00d1\21\3\2\2\2\u00d2"+
-    "\u00d3\7+\2\2\u00d3\23\3\2\2\2\u00d4\u00d5\7\60\2\2\u00d5\u00d6\3\2\2"+
-    "\2\u00d6\u00d7\b\n\3\2\u00d7\25\3\2\2\2\u00d8\u00d9\7.\2\2\u00d9\27\3"+
-    "\2\2\2\u00da\u00db\7=\2\2\u00db\31\3\2\2\2\u00dc\u00dd\7k\2\2\u00dd\u00de"+
-    "\7h\2\2\u00de\33\3\2\2\2\u00df\u00e0\7k\2\2\u00e0\u00e1\7p\2\2\u00e1\35"+
-    "\3\2\2\2\u00e2\u00e3\7g\2\2\u00e3\u00e4\7n\2\2\u00e4\u00e5\7u\2\2\u00e5"+
-    "\u00e6\7g\2\2\u00e6\37\3\2\2\2\u00e7\u00e8\7y\2\2\u00e8\u00e9\7j\2\2\u00e9"+
-    "\u00ea\7k\2\2\u00ea\u00eb\7n\2\2\u00eb\u00ec\7g\2\2\u00ec!\3\2\2\2\u00ed"+
-    "\u00ee\7f\2\2\u00ee\u00ef\7q\2\2\u00ef#\3\2\2\2\u00f0\u00f1\7h\2\2\u00f1"+
-    "\u00f2\7q\2\2\u00f2\u00f3\7t\2\2\u00f3%\3\2\2\2\u00f4\u00f5\7e\2\2\u00f5"+
-    "\u00f6\7q\2\2\u00f6\u00f7\7p\2\2\u00f7\u00f8\7v\2\2\u00f8\u00f9\7k\2\2"+
-    "\u00f9\u00fa\7p\2\2\u00fa\u00fb\7w\2\2\u00fb\u00fc\7g\2\2\u00fc\'\3\2"+
-    "\2\2\u00fd\u00fe\7d\2\2\u00fe\u00ff\7t\2\2\u00ff\u0100\7g\2\2\u0100\u0101"+
-    "\7c\2\2\u0101\u0102\7m\2\2\u0102)\3\2\2\2\u0103\u0104\7t\2\2\u0104\u0105"+
-    "\7g\2\2\u0105\u0106\7v\2\2\u0106\u0107\7w\2\2\u0107\u0108\7t\2\2\u0108"+
-    "\u0109\7p\2\2\u0109+\3\2\2\2\u010a\u010b\7p\2\2\u010b\u010c\7g\2\2\u010c"+
-    "\u010d\7y\2\2\u010d-\3\2\2\2\u010e\u010f\7v\2\2\u010f\u0110\7t\2\2\u0110"+
-    "\u0111\7{\2\2\u0111/\3\2\2\2\u0112\u0113\7e\2\2\u0113\u0114\7c\2\2\u0114"+
-    "\u0115\7v\2\2\u0115\u0116\7e\2\2\u0116\u0117\7j\2\2\u0117\61\3\2\2\2\u0118"+
-    "\u0119\7v\2\2\u0119\u011a\7j\2\2\u011a\u011b\7t\2\2\u011b\u011c\7q\2\2"+
-    "\u011c\u011d\7y\2\2\u011d\63\3\2\2\2\u011e\u011f\7v\2\2\u011f\u0120\7"+
-    "j\2\2\u0120\u0121\7k\2\2\u0121\u0122\7u\2\2\u0122\65\3\2\2\2\u0123\u0124"+
-    "\7k\2\2\u0124\u0125\7p\2\2\u0125\u0126\7u\2\2\u0126\u0127\7v\2\2\u0127"+
-    "\u0128\7c\2\2\u0128\u0129\7p\2\2\u0129\u012a\7e\2\2\u012a\u012b\7g\2\2"+
-    "\u012b\u012c\7q\2\2\u012c\u012d\7h\2\2\u012d\67\3\2\2\2\u012e\u012f\7"+
-    "#\2\2\u012f9\3\2\2\2\u0130\u0131\7\u0080\2\2\u0131;\3\2\2\2\u0132\u0133"+
-    "\7,\2\2\u0133=\3\2\2\2\u0134\u0135\7\61\2\2\u0135\u0136\6\37\2\2\u0136"+
-    "?\3\2\2\2\u0137\u0138\7\'\2\2\u0138A\3\2\2\2\u0139\u013a\7-\2\2\u013a"+
-    "C\3\2\2\2\u013b\u013c\7/\2\2\u013cE\3\2\2\2\u013d\u013e\7>\2\2\u013e\u013f"+
-    "\7>\2\2\u013fG\3\2\2\2\u0140\u0141\7@\2\2\u0141\u0142\7@\2\2\u0142I\3"+
-    "\2\2\2\u0143\u0144\7@\2\2\u0144\u0145\7@\2\2\u0145\u0146\7@\2\2\u0146"+
-    "K\3\2\2\2\u0147\u0148\7>\2\2\u0148M\3\2\2\2\u0149\u014a\7>\2\2\u014a\u014b"+
-    "\7?\2\2\u014bO\3\2\2\2\u014c\u014d\7@\2\2\u014dQ\3\2\2\2\u014e\u014f\7"+
-    "@\2\2\u014f\u0150\7?\2\2\u0150S\3\2\2\2\u0151\u0152\7?\2\2\u0152\u0153"+
-    "\7?\2\2\u0153U\3\2\2\2\u0154\u0155\7?\2\2\u0155\u0156\7?\2\2\u0156\u0157"+
-    "\7?\2\2\u0157W\3\2\2\2\u0158\u0159\7#\2\2\u0159\u015a\7?\2\2\u015aY\3"+
-    "\2\2\2\u015b\u015c\7#\2\2\u015c\u015d\7?\2\2\u015d\u015e\7?\2\2\u015e"+
-    "[\3\2\2\2\u015f\u0160\7(\2\2\u0160]\3\2\2\2\u0161\u0162\7`\2\2\u0162_"+
-    "\3\2\2\2\u0163\u0164\7~\2\2\u0164a\3\2\2\2\u0165\u0166\7(\2\2\u0166\u0167"+
-    "\7(\2\2\u0167c\3\2\2\2\u0168\u0169\7~\2\2\u0169\u016a\7~\2\2\u016ae\3"+
-    "\2\2\2\u016b\u016c\7A\2\2\u016cg\3\2\2\2\u016d\u016e\7<\2\2\u016ei\3\2"+
-    "\2\2\u016f\u0170\7<\2\2\u0170\u0171\7<\2\2\u0171k\3\2\2\2\u0172\u0173"+
-    "\7/\2\2\u0173\u0174\7@\2\2\u0174m\3\2\2\2\u0175\u0176\7?\2\2\u0176\u0177"+
-    "\7\u0080\2\2\u0177o\3\2\2\2\u0178\u0179\7?\2\2\u0179\u017a\7?\2\2\u017a"+
-    "\u017b\7\u0080\2\2\u017bq\3\2\2\2\u017c\u017d\7-\2\2\u017d\u017e\7-\2"+
-    "\2\u017es\3\2\2\2\u017f\u0180\7/\2\2\u0180\u0181\7/\2\2\u0181u\3\2\2\2"+
-    "\u0182\u0183\7?\2\2\u0183w\3\2\2\2\u0184\u0185\7-\2\2\u0185\u0186\7?\2"+
-    "\2\u0186y\3\2\2\2\u0187\u0188\7/\2\2\u0188\u0189\7?\2\2\u0189{\3\2\2\2"+
-    "\u018a\u018b\7,\2\2\u018b\u018c\7?\2\2\u018c}\3\2\2\2\u018d\u018e\7\61"+
-    "\2\2\u018e\u018f\7?\2\2\u018f\177\3\2\2\2\u0190\u0191\7\'\2\2\u0191\u0192"+
-    "\7?\2\2\u0192\u0081\3\2\2\2\u0193\u0194\7(\2\2\u0194\u0195\7?\2\2\u0195"+
-    "\u0083\3\2\2\2\u0196\u0197\7`\2\2\u0197\u0198\7?\2\2\u0198\u0085\3\2\2"+
-    "\2\u0199\u019a\7~\2\2\u019a\u019b\7?\2\2\u019b\u0087\3\2\2\2\u019c\u019d"+
-    "\7>\2\2\u019d\u019e\7>\2\2\u019e\u019f\7?\2\2\u019f\u0089\3\2\2\2\u01a0"+
-    "\u01a1\7@\2\2\u01a1\u01a2\7@\2\2\u01a2\u01a3\7?\2\2\u01a3\u008b\3\2\2"+
-    "\2\u01a4\u01a5\7@\2\2\u01a5\u01a6\7@\2\2\u01a6\u01a7\7@\2\2\u01a7\u01a8"+
-    "\7?\2\2\u01a8\u008d\3\2\2\2\u01a9\u01ab\7\62\2\2\u01aa\u01ac\t\4\2\2\u01ab"+
-    "\u01aa\3\2\2\2\u01ac\u01ad\3\2\2\2\u01ad\u01ab\3\2\2\2\u01ad\u01ae\3\2"+
-    "\2\2\u01ae\u01b0\3\2\2\2\u01af\u01b1\t\5\2\2\u01b0\u01af\3\2\2\2\u01b0"+
-    "\u01b1\3\2\2\2\u01b1\u008f\3\2\2\2\u01b2\u01b3\7\62\2\2\u01b3\u01b5\t"+
-    "\6\2\2\u01b4\u01b6\t\7\2\2\u01b5\u01b4\3\2\2\2\u01b6\u01b7\3\2\2\2\u01b7"+
-    "\u01b5\3\2\2\2\u01b7\u01b8\3\2\2\2\u01b8\u01ba\3\2\2\2\u01b9\u01bb\t\5"+
-    "\2\2\u01ba\u01b9\3\2\2\2\u01ba\u01bb\3\2\2\2\u01bb\u0091\3\2\2\2\u01bc"+
-    "\u01c5\7\62\2\2\u01bd\u01c1\t\b\2\2\u01be\u01c0\t\t\2\2\u01bf\u01be\3"+
-    "\2\2\2\u01c0\u01c3\3\2\2\2\u01c1\u01bf\3\2\2\2\u01c1\u01c2\3\2\2\2\u01c2"+
-    "\u01c5\3\2\2\2\u01c3\u01c1\3\2\2\2\u01c4\u01bc\3\2\2\2\u01c4\u01bd\3\2"+
-    "\2\2\u01c5\u01c7\3\2\2\2\u01c6\u01c8\t\n\2\2\u01c7\u01c6\3\2\2\2\u01c7"+
-    "\u01c8\3\2\2\2\u01c8\u0093\3\2\2\2\u01c9\u01d2\7\62\2\2\u01ca\u01ce\t"+
-    "\b\2\2\u01cb\u01cd\t\t\2\2\u01cc\u01cb\3\2\2\2\u01cd\u01d0\3\2\2\2\u01ce"+
-    "\u01cc\3\2\2\2\u01ce\u01cf\3\2\2\2\u01cf\u01d2\3\2\2\2\u01d0\u01ce\3\2"+
-    "\2\2\u01d1\u01c9\3\2\2\2\u01d1\u01ca\3\2\2\2\u01d2\u01d9\3\2\2\2\u01d3"+
-    "\u01d5\5\24\n\2\u01d4\u01d6\t\t\2\2\u01d5\u01d4\3\2\2\2\u01d6\u01d7\3"+
-    "\2\2\2\u01d7\u01d5\3\2\2\2\u01d7\u01d8\3\2\2\2\u01d8\u01da\3\2\2\2\u01d9"+
-    "\u01d3\3\2\2\2\u01d9\u01da\3\2\2\2\u01da\u01e4\3\2\2\2\u01db\u01dd\t\13"+
-    "\2\2\u01dc\u01de\t\f\2\2\u01dd\u01dc\3\2\2\2\u01dd\u01de\3\2\2\2\u01de"+
-    "\u01e0\3\2\2\2\u01df\u01e1\t\t\2\2\u01e0\u01df\3\2\2\2\u01e1\u01e2\3\2"+
-    "\2\2\u01e2\u01e0\3\2\2\2\u01e2\u01e3\3\2\2\2\u01e3\u01e5\3\2\2\2\u01e4"+
-    "\u01db\3\2\2\2\u01e4\u01e5\3\2\2\2\u01e5\u01e7\3\2\2\2\u01e6\u01e8\t\r"+
-    "\2\2\u01e7\u01e6\3\2\2\2\u01e7\u01e8\3\2\2\2\u01e8\u0095\3\2\2\2\u01e9"+
-    "\u01f1\7$\2\2\u01ea\u01eb\7^\2\2\u01eb\u01f0\7$\2\2\u01ec\u01ed\7^\2\2"+
-    "\u01ed\u01f0\7^\2\2\u01ee\u01f0\n\16\2\2\u01ef\u01ea\3\2\2\2\u01ef\u01ec"+
-    "\3\2\2\2\u01ef\u01ee\3\2\2\2\u01f0\u01f3\3\2\2\2\u01f1\u01f2\3\2\2\2\u01f1"+
-    "\u01ef\3\2\2\2\u01f2\u01f4\3\2\2\2\u01f3\u01f1\3\2\2\2\u01f4\u0202\7$"+
-    "\2\2\u01f5\u01fd\7)\2\2\u01f6\u01f7\7^\2\2\u01f7\u01fc\7)\2\2\u01f8\u01f9"+
-    "\7^\2\2\u01f9\u01fc\7^\2\2\u01fa\u01fc\n\16\2\2\u01fb\u01f6\3\2\2\2\u01fb"+
-    "\u01f8\3\2\2\2\u01fb\u01fa\3\2\2\2\u01fc\u01ff\3\2\2\2\u01fd\u01fe\3\2"+
-    "\2\2\u01fd\u01fb\3\2\2\2\u01fe\u0200\3\2\2\2\u01ff\u01fd\3\2\2\2\u0200"+
-    "\u0202\7)\2\2\u0201\u01e9\3\2\2\2\u0201\u01f5\3\2\2\2\u0202\u0097\3\2"+
-    "\2\2\u0203\u0207\7\61\2\2\u0204\u0208\n\17\2\2\u0205\u0206\7^\2\2\u0206"+
-    "\u0208\n\20\2\2\u0207\u0204\3\2\2\2\u0207\u0205\3\2\2\2\u0208\u0209\3"+
-    "\2\2\2\u0209\u0207\3\2\2\2\u0209\u020a\3\2\2\2\u020a\u020b\3\2\2\2\u020b"+
-    "\u020f\7\61\2\2\u020c\u020e\t\21\2\2\u020d\u020c\3\2\2\2\u020e\u0211\3"+
-    "\2\2\2\u020f\u020d\3\2\2\2\u020f\u0210\3\2\2\2\u0210\u0212\3\2\2\2\u0211"+
-    "\u020f\3\2\2\2\u0212\u0213\6L\3\2\u0213\u0099\3\2\2\2\u0214\u0215\7v\2"+
-    "\2\u0215\u0216\7t\2\2\u0216\u0217\7w\2\2\u0217\u0218\7g\2\2\u0218\u009b"+
-    "\3\2\2\2\u0219\u021a\7h\2\2\u021a\u021b\7c\2\2\u021b\u021c\7n\2\2\u021c"+
-    "\u021d\7u\2\2\u021d\u021e\7g\2\2\u021e\u009d\3\2\2\2\u021f\u0220\7p\2"+
-    "\2\u0220\u0221\7w\2\2\u0221\u0222\7n\2\2\u0222\u0223\7n\2\2\u0223\u009f"+
-    "\3\2\2\2\u0224\u022a\5\u00a2Q\2\u0225\u0226\5\24\n\2\u0226\u0227\5\u00a2"+
-    "Q\2\u0227\u0229\3\2\2\2\u0228\u0225\3\2\2\2\u0229\u022c\3\2\2\2\u022a"+
-    "\u0228\3\2\2\2\u022a\u022b\3\2\2\2\u022b\u022d\3\2\2\2\u022c\u022a\3\2"+
-    "\2\2\u022d\u022e\6P\4\2\u022e\u00a1\3\2\2\2\u022f\u0233\t\22\2\2\u0230"+
-    "\u0232\t\23\2\2\u0231\u0230\3\2\2\2\u0232\u0235\3\2\2\2\u0233\u0231\3"+
-    "\2\2\2\u0233\u0234\3\2\2\2\u0234\u00a3\3\2\2\2\u0235\u0233\3\2\2\2\u0236"+
-    "\u023f\7\62\2\2\u0237\u023b\t\b\2\2\u0238\u023a\t\t\2\2\u0239\u0238\3"+
-    "\2\2\2\u023a\u023d\3\2\2\2\u023b\u0239\3\2\2\2\u023b\u023c\3\2\2\2\u023c"+
-    "\u023f\3\2\2\2\u023d\u023b\3\2\2\2\u023e\u0236\3\2\2\2\u023e\u0237\3\2"+
-    "\2\2\u023f\u0240\3\2\2\2\u0240\u0241\bR\4\2\u0241\u00a5\3\2\2\2\u0242"+
-    "\u0246\t\22\2\2\u0243\u0245\t\23\2\2\u0244\u0243\3\2\2\2\u0245\u0248\3"+
-    "\2\2\2\u0246\u0244\3\2\2\2\u0246\u0247\3\2\2\2\u0247\u0249\3\2\2\2\u0248"+
-    "\u0246\3\2\2\2\u0249\u024a\bS\4\2\u024a\u00a7\3\2\2\2$\2\3\u00ab\u00b5"+
-    "\u00bf\u00c4\u01ad\u01b0\u01b7\u01ba\u01c1\u01c4\u01c7\u01ce\u01d1\u01d7"+
-    "\u01d9\u01dd\u01e2\u01e4\u01e7\u01ef\u01f1\u01fb\u01fd\u0201\u0207\u0209"+
-    "\u020f\u022a\u0233\u023b\u023e\u0246\5\b\2\2\4\3\2\4\2\2";
+    "I\tI\4J\tJ\4K\tK\4L\tL\4M\tM\4N\tN\4O\tO\4P\tP\4Q\tQ\4R\tR\4S\tS\4T\t"+
+    "T\4U\tU\3\2\6\2\u00ae\n\2\r\2\16\2\u00af\3\2\3\2\3\3\3\3\3\3\3\3\7\3\u00b8"+
+    "\n\3\f\3\16\3\u00bb\13\3\3\3\3\3\3\3\3\3\3\3\7\3\u00c2\n\3\f\3\16\3\u00c5"+
+    "\13\3\3\3\3\3\5\3\u00c9\n\3\3\3\3\3\3\4\3\4\3\5\3\5\3\6\3\6\3\7\3\7\3"+
+    "\b\3\b\3\t\3\t\3\n\3\n\3\n\3\n\3\13\3\13\3\13\3\13\3\13\3\f\3\f\3\r\3"+
+    "\r\3\16\3\16\3\16\3\17\3\17\3\17\3\20\3\20\3\20\3\20\3\20\3\21\3\21\3"+
+    "\21\3\21\3\21\3\21\3\22\3\22\3\22\3\23\3\23\3\23\3\23\3\24\3\24\3\24\3"+
+    "\24\3\24\3\24\3\24\3\24\3\24\3\25\3\25\3\25\3\25\3\25\3\25\3\26\3\26\3"+
+    "\26\3\26\3\26\3\26\3\26\3\27\3\27\3\27\3\27\3\30\3\30\3\30\3\30\3\31\3"+
+    "\31\3\31\3\31\3\31\3\31\3\32\3\32\3\32\3\32\3\32\3\32\3\33\3\33\3\33\3"+
+    "\33\3\33\3\34\3\34\3\34\3\34\3\34\3\34\3\34\3\34\3\34\3\34\3\34\3\35\3"+
+    "\35\3\36\3\36\3\37\3\37\3 \3 \3 \3!\3!\3\"\3\"\3#\3#\3$\3$\3$\3%\3%\3"+
+    "%\3&\3&\3&\3&\3\'\3\'\3(\3(\3(\3)\3)\3*\3*\3*\3+\3+\3+\3,\3,\3,\3,\3-"+
+    "\3-\3-\3.\3.\3.\3.\3/\3/\3\60\3\60\3\61\3\61\3\62\3\62\3\62\3\63\3\63"+
+    "\3\63\3\64\3\64\3\65\3\65\3\66\3\66\3\66\3\67\3\67\3\67\38\38\38\39\3"+
+    "9\39\3:\3:\3:\3:\3;\3;\3;\3<\3<\3<\3=\3=\3>\3>\3>\3?\3?\3?\3@\3@\3@\3"+
+    "A\3A\3A\3B\3B\3B\3C\3C\3C\3D\3D\3D\3E\3E\3E\3F\3F\3F\3F\3G\3G\3G\3G\3"+
+    "H\3H\3H\3H\3H\3I\3I\6I\u01b8\nI\rI\16I\u01b9\3I\5I\u01bd\nI\3J\3J\3J\6"+
+    "J\u01c2\nJ\rJ\16J\u01c3\3J\5J\u01c7\nJ\3K\3K\3K\7K\u01cc\nK\fK\16K\u01cf"+
+    "\13K\5K\u01d1\nK\3K\5K\u01d4\nK\3L\3L\3L\7L\u01d9\nL\fL\16L\u01dc\13L"+
+    "\5L\u01de\nL\3L\3L\6L\u01e2\nL\rL\16L\u01e3\5L\u01e6\nL\3L\3L\5L\u01ea"+
+    "\nL\3L\6L\u01ed\nL\rL\16L\u01ee\5L\u01f1\nL\3L\5L\u01f4\nL\3M\3M\3M\3"+
+    "M\3M\3M\7M\u01fc\nM\fM\16M\u01ff\13M\3M\3M\3M\3M\3M\3M\3M\7M\u0208\nM"+
+    "\fM\16M\u020b\13M\3M\5M\u020e\nM\3N\3N\3N\3N\6N\u0214\nN\rN\16N\u0215"+
+    "\3N\3N\7N\u021a\nN\fN\16N\u021d\13N\3N\3N\3O\3O\3O\3O\3O\3P\3P\3P\3P\3"+
+    "P\3P\3Q\3Q\3Q\3Q\3Q\3R\3R\3R\3R\7R\u0235\nR\fR\16R\u0238\13R\3R\3R\3S"+
+    "\3S\7S\u023e\nS\fS\16S\u0241\13S\3T\3T\3T\7T\u0246\nT\fT\16T\u0249\13"+
+    "T\5T\u024b\nT\3T\3T\3U\3U\7U\u0251\nU\fU\16U\u0254\13U\3U\3U\6\u00b9\u00c3"+
+    "\u01fd\u0209\2V\4\3\6\4\b\5\n\6\f\7\16\b\20\t\22\n\24\13\26\f\30\r\32"+
+    "\16\34\17\36\20 \21\"\22$\23&\24(\25*\26,\27.\30\60\31\62\32\64\33\66"+
+    "\348\35:\36<\37> @!B\"D#F$H%J&L\'N(P)R*T+V,X-Z.\\/^\60`\61b\62d\63f\64"+
+    "h\65j\66l\67n8p9r:t;v<x=z>|?~@\u0080A\u0082B\u0084C\u0086D\u0088E\u008a"+
+    "F\u008cG\u008eH\u0090I\u0092J\u0094K\u0096L\u0098M\u009aN\u009cO\u009e"+
+    "P\u00a0Q\u00a2R\u00a4S\u00a6T\u00a8U\u00aaV\4\2\3\24\5\2\13\f\17\17\""+
+    "\"\4\2\f\f\17\17\3\2\629\4\2NNnn\4\2ZZzz\5\2\62;CHch\3\2\63;\3\2\62;\b"+
+    "\2FFHHNNffhhnn\4\2GGgg\4\2--//\6\2FFHHffhh\4\2$$^^\4\2\f\f\61\61\3\2\f"+
+    "\f\t\2WWeekknouuwwzz\5\2C\\aac|\6\2\62;C\\aac|\u0277\2\4\3\2\2\2\2\6\3"+
+    "\2\2\2\2\b\3\2\2\2\2\n\3\2\2\2\2\f\3\2\2\2\2\16\3\2\2\2\2\20\3\2\2\2\2"+
+    "\22\3\2\2\2\2\24\3\2\2\2\2\26\3\2\2\2\2\30\3\2\2\2\2\32\3\2\2\2\2\34\3"+
+    "\2\2\2\2\36\3\2\2\2\2 \3\2\2\2\2\"\3\2\2\2\2$\3\2\2\2\2&\3\2\2\2\2(\3"+
+    "\2\2\2\2*\3\2\2\2\2,\3\2\2\2\2.\3\2\2\2\2\60\3\2\2\2\2\62\3\2\2\2\2\64"+
+    "\3\2\2\2\2\66\3\2\2\2\28\3\2\2\2\2:\3\2\2\2\2<\3\2\2\2\2>\3\2\2\2\2@\3"+
+    "\2\2\2\2B\3\2\2\2\2D\3\2\2\2\2F\3\2\2\2\2H\3\2\2\2\2J\3\2\2\2\2L\3\2\2"+
+    "\2\2N\3\2\2\2\2P\3\2\2\2\2R\3\2\2\2\2T\3\2\2\2\2V\3\2\2\2\2X\3\2\2\2\2"+
+    "Z\3\2\2\2\2\\\3\2\2\2\2^\3\2\2\2\2`\3\2\2\2\2b\3\2\2\2\2d\3\2\2\2\2f\3"+
+    "\2\2\2\2h\3\2\2\2\2j\3\2\2\2\2l\3\2\2\2\2n\3\2\2\2\2p\3\2\2\2\2r\3\2\2"+
+    "\2\2t\3\2\2\2\2v\3\2\2\2\2x\3\2\2\2\2z\3\2\2\2\2|\3\2\2\2\2~\3\2\2\2\2"+
+    "\u0080\3\2\2\2\2\u0082\3\2\2\2\2\u0084\3\2\2\2\2\u0086\3\2\2\2\2\u0088"+
+    "\3\2\2\2\2\u008a\3\2\2\2\2\u008c\3\2\2\2\2\u008e\3\2\2\2\2\u0090\3\2\2"+
+    "\2\2\u0092\3\2\2\2\2\u0094\3\2\2\2\2\u0096\3\2\2\2\2\u0098\3\2\2\2\2\u009a"+
+    "\3\2\2\2\2\u009c\3\2\2\2\2\u009e\3\2\2\2\2\u00a0\3\2\2\2\2\u00a2\3\2\2"+
+    "\2\2\u00a4\3\2\2\2\2\u00a6\3\2\2\2\3\u00a8\3\2\2\2\3\u00aa\3\2\2\2\4\u00ad"+
+    "\3\2\2\2\6\u00c8\3\2\2\2\b\u00cc\3\2\2\2\n\u00ce\3\2\2\2\f\u00d0\3\2\2"+
+    "\2\16\u00d2\3\2\2\2\20\u00d4\3\2\2\2\22\u00d6\3\2\2\2\24\u00d8\3\2\2\2"+
+    "\26\u00dc\3\2\2\2\30\u00e1\3\2\2\2\32\u00e3\3\2\2\2\34\u00e5\3\2\2\2\36"+
+    "\u00e8\3\2\2\2 \u00eb\3\2\2\2\"\u00f0\3\2\2\2$\u00f6\3\2\2\2&\u00f9\3"+
+    "\2\2\2(\u00fd\3\2\2\2*\u0106\3\2\2\2,\u010c\3\2\2\2.\u0113\3\2\2\2\60"+
+    "\u0117\3\2\2\2\62\u011b\3\2\2\2\64\u0121\3\2\2\2\66\u0127\3\2\2\28\u012c"+
+    "\3\2\2\2:\u0137\3\2\2\2<\u0139\3\2\2\2>\u013b\3\2\2\2@\u013d\3\2\2\2B"+
+    "\u0140\3\2\2\2D\u0142\3\2\2\2F\u0144\3\2\2\2H\u0146\3\2\2\2J\u0149\3\2"+
+    "\2\2L\u014c\3\2\2\2N\u0150\3\2\2\2P\u0152\3\2\2\2R\u0155\3\2\2\2T\u0157"+
+    "\3\2\2\2V\u015a\3\2\2\2X\u015d\3\2\2\2Z\u0161\3\2\2\2\\\u0164\3\2\2\2"+
+    "^\u0168\3\2\2\2`\u016a\3\2\2\2b\u016c\3\2\2\2d\u016e\3\2\2\2f\u0171\3"+
+    "\2\2\2h\u0174\3\2\2\2j\u0176\3\2\2\2l\u0178\3\2\2\2n\u017b\3\2\2\2p\u017e"+
+    "\3\2\2\2r\u0181\3\2\2\2t\u0184\3\2\2\2v\u0188\3\2\2\2x\u018b\3\2\2\2z"+
+    "\u018e\3\2\2\2|\u0190\3\2\2\2~\u0193\3\2\2\2\u0080\u0196\3\2\2\2\u0082"+
+    "\u0199\3\2\2\2\u0084\u019c\3\2\2\2\u0086\u019f\3\2\2\2\u0088\u01a2\3\2"+
+    "\2\2\u008a\u01a5\3\2\2\2\u008c\u01a8\3\2\2\2\u008e\u01ac\3\2\2\2\u0090"+
+    "\u01b0\3\2\2\2\u0092\u01b5\3\2\2\2\u0094\u01be\3\2\2\2\u0096\u01d0\3\2"+
+    "\2\2\u0098\u01dd\3\2\2\2\u009a\u020d\3\2\2\2\u009c\u020f\3\2\2\2\u009e"+
+    "\u0220\3\2\2\2\u00a0\u0225\3\2\2\2\u00a2\u022b\3\2\2\2\u00a4\u0230\3\2"+
+    "\2\2\u00a6\u023b\3\2\2\2\u00a8\u024a\3\2\2\2\u00aa\u024e\3\2\2\2\u00ac"+
+    "\u00ae\t\2\2\2\u00ad\u00ac\3\2\2\2\u00ae\u00af\3\2\2\2\u00af\u00ad\3\2"+
+    "\2\2\u00af\u00b0\3\2\2\2\u00b0\u00b1\3\2\2\2\u00b1\u00b2\b\2\2\2\u00b2"+
+    "\5\3\2\2\2\u00b3\u00b4\7\61\2\2\u00b4\u00b5\7\61\2\2\u00b5\u00b9\3\2\2"+
+    "\2\u00b6\u00b8\13\2\2\2\u00b7\u00b6\3\2\2\2\u00b8\u00bb\3\2\2\2\u00b9"+
+    "\u00ba\3\2\2\2\u00b9\u00b7\3\2\2\2\u00ba\u00bc\3\2\2\2\u00bb\u00b9\3\2"+
+    "\2\2\u00bc\u00c9\t\3\2\2\u00bd\u00be\7\61\2\2\u00be\u00bf\7,\2\2\u00bf"+
+    "\u00c3\3\2\2\2\u00c0\u00c2\13\2\2\2\u00c1\u00c0\3\2\2\2\u00c2\u00c5\3"+
+    "\2\2\2\u00c3\u00c4\3\2\2\2\u00c3\u00c1\3\2\2\2\u00c4\u00c6\3\2\2\2\u00c5"+
+    "\u00c3\3\2\2\2\u00c6\u00c7\7,\2\2\u00c7\u00c9\7\61\2\2\u00c8\u00b3\3\2"+
+    "\2\2\u00c8\u00bd\3\2\2\2\u00c9\u00ca\3\2\2\2\u00ca\u00cb\b\3\2\2\u00cb"+
+    "\7\3\2\2\2\u00cc\u00cd\7}\2\2\u00cd\t\3\2\2\2\u00ce\u00cf\7\177\2\2\u00cf"+
+    "\13\3\2\2\2\u00d0\u00d1\7]\2\2\u00d1\r\3\2\2\2\u00d2\u00d3\7_\2\2\u00d3"+
+    "\17\3\2\2\2\u00d4\u00d5\7*\2\2\u00d5\21\3\2\2\2\u00d6\u00d7\7+\2\2\u00d7"+
+    "\23\3\2\2\2\u00d8\u00d9\7\60\2\2\u00d9\u00da\3\2\2\2\u00da\u00db\b\n\3"+
+    "\2\u00db\25\3\2\2\2\u00dc\u00dd\7A\2\2\u00dd\u00de\7\60\2\2\u00de\u00df"+
+    "\3\2\2\2\u00df\u00e0\b\13\3\2\u00e0\27\3\2\2\2\u00e1\u00e2\7.\2\2\u00e2"+
+    "\31\3\2\2\2\u00e3\u00e4\7=\2\2\u00e4\33\3\2\2\2\u00e5\u00e6\7k\2\2\u00e6"+
+    "\u00e7\7h\2\2\u00e7\35\3\2\2\2\u00e8\u00e9\7k\2\2\u00e9\u00ea\7p\2\2\u00ea"+
+    "\37\3\2\2\2\u00eb\u00ec\7g\2\2\u00ec\u00ed\7n\2\2\u00ed\u00ee\7u\2\2\u00ee"+
+    "\u00ef\7g\2\2\u00ef!\3\2\2\2\u00f0\u00f1\7y\2\2\u00f1\u00f2\7j\2\2\u00f2"+
+    "\u00f3\7k\2\2\u00f3\u00f4\7n\2\2\u00f4\u00f5\7g\2\2\u00f5#\3\2\2\2\u00f6"+
+    "\u00f7\7f\2\2\u00f7\u00f8\7q\2\2\u00f8%\3\2\2\2\u00f9\u00fa\7h\2\2\u00fa"+
+    "\u00fb\7q\2\2\u00fb\u00fc\7t\2\2\u00fc\'\3\2\2\2\u00fd\u00fe\7e\2\2\u00fe"+
+    "\u00ff\7q\2\2\u00ff\u0100\7p\2\2\u0100\u0101\7v\2\2\u0101\u0102\7k\2\2"+
+    "\u0102\u0103\7p\2\2\u0103\u0104\7w\2\2\u0104\u0105\7g\2\2\u0105)\3\2\2"+
+    "\2\u0106\u0107\7d\2\2\u0107\u0108\7t\2\2\u0108\u0109\7g\2\2\u0109\u010a"+
+    "\7c\2\2\u010a\u010b\7m\2\2\u010b+\3\2\2\2\u010c\u010d\7t\2\2\u010d\u010e"+
+    "\7g\2\2\u010e\u010f\7v\2\2\u010f\u0110\7w\2\2\u0110\u0111\7t\2\2\u0111"+
+    "\u0112\7p\2\2\u0112-\3\2\2\2\u0113\u0114\7p\2\2\u0114\u0115\7g\2\2\u0115"+
+    "\u0116\7y\2\2\u0116/\3\2\2\2\u0117\u0118\7v\2\2\u0118\u0119\7t\2\2\u0119"+
+    "\u011a\7{\2\2\u011a\61\3\2\2\2\u011b\u011c\7e\2\2\u011c\u011d\7c\2\2\u011d"+
+    "\u011e\7v\2\2\u011e\u011f\7e\2\2\u011f\u0120\7j\2\2\u0120\63\3\2\2\2\u0121"+
+    "\u0122\7v\2\2\u0122\u0123\7j\2\2\u0123\u0124\7t\2\2\u0124\u0125\7q\2\2"+
+    "\u0125\u0126\7y\2\2\u0126\65\3\2\2\2\u0127\u0128\7v\2\2\u0128\u0129\7"+
+    "j\2\2\u0129\u012a\7k\2\2\u012a\u012b\7u\2\2\u012b\67\3\2\2\2\u012c\u012d"+
+    "\7k\2\2\u012d\u012e\7p\2\2\u012e\u012f\7u\2\2\u012f\u0130\7v\2\2\u0130"+
+    "\u0131\7c\2\2\u0131\u0132\7p\2\2\u0132\u0133\7e\2\2\u0133\u0134\7g\2\2"+
+    "\u0134\u0135\7q\2\2\u0135\u0136\7h\2\2\u01369\3\2\2\2\u0137\u0138\7#\2"+
+    "\2\u0138;\3\2\2\2\u0139\u013a\7\u0080\2\2\u013a=\3\2\2\2\u013b\u013c\7"+
+    ",\2\2\u013c?\3\2\2\2\u013d\u013e\7\61\2\2\u013e\u013f\6 \2\2\u013fA\3"+
+    "\2\2\2\u0140\u0141\7\'\2\2\u0141C\3\2\2\2\u0142\u0143\7-\2\2\u0143E\3"+
+    "\2\2\2\u0144\u0145\7/\2\2\u0145G\3\2\2\2\u0146\u0147\7>\2\2\u0147\u0148"+
+    "\7>\2\2\u0148I\3\2\2\2\u0149\u014a\7@\2\2\u014a\u014b\7@\2\2\u014bK\3"+
+    "\2\2\2\u014c\u014d\7@\2\2\u014d\u014e\7@\2\2\u014e\u014f\7@\2\2\u014f"+
+    "M\3\2\2\2\u0150\u0151\7>\2\2\u0151O\3\2\2\2\u0152\u0153\7>\2\2\u0153\u0154"+
+    "\7?\2\2\u0154Q\3\2\2\2\u0155\u0156\7@\2\2\u0156S\3\2\2\2\u0157\u0158\7"+
+    "@\2\2\u0158\u0159\7?\2\2\u0159U\3\2\2\2\u015a\u015b\7?\2\2\u015b\u015c"+
+    "\7?\2\2\u015cW\3\2\2\2\u015d\u015e\7?\2\2\u015e\u015f\7?\2\2\u015f\u0160"+
+    "\7?\2\2\u0160Y\3\2\2\2\u0161\u0162\7#\2\2\u0162\u0163\7?\2\2\u0163[\3"+
+    "\2\2\2\u0164\u0165\7#\2\2\u0165\u0166\7?\2\2\u0166\u0167\7?\2\2\u0167"+
+    "]\3\2\2\2\u0168\u0169\7(\2\2\u0169_\3\2\2\2\u016a\u016b\7`\2\2\u016ba"+
+    "\3\2\2\2\u016c\u016d\7~\2\2\u016dc\3\2\2\2\u016e\u016f\7(\2\2\u016f\u0170"+
+    "\7(\2\2\u0170e\3\2\2\2\u0171\u0172\7~\2\2\u0172\u0173\7~\2\2\u0173g\3"+
+    "\2\2\2\u0174\u0175\7A\2\2\u0175i\3\2\2\2\u0176\u0177\7<\2\2\u0177k\3\2"+
+    "\2\2\u0178\u0179\7A\2\2\u0179\u017a\7<\2\2\u017am\3\2\2\2\u017b\u017c"+
+    "\7<\2\2\u017c\u017d\7<\2\2\u017do\3\2\2\2\u017e\u017f\7/\2\2\u017f\u0180"+
+    "\7@\2\2\u0180q\3\2\2\2\u0181\u0182\7?\2\2\u0182\u0183\7\u0080\2\2\u0183"+
+    "s\3\2\2\2\u0184\u0185\7?\2\2\u0185\u0186\7?\2\2\u0186\u0187\7\u0080\2"+
+    "\2\u0187u\3\2\2\2\u0188\u0189\7-\2\2\u0189\u018a\7-\2\2\u018aw\3\2\2\2"+
+    "\u018b\u018c\7/\2\2\u018c\u018d\7/\2\2\u018dy\3\2\2\2\u018e\u018f\7?\2"+
+    "\2\u018f{\3\2\2\2\u0190\u0191\7-\2\2\u0191\u0192\7?\2\2\u0192}\3\2\2\2"+
+    "\u0193\u0194\7/\2\2\u0194\u0195\7?\2\2\u0195\177\3\2\2\2\u0196\u0197\7"+
+    ",\2\2\u0197\u0198\7?\2\2\u0198\u0081\3\2\2\2\u0199\u019a\7\61\2\2\u019a"+
+    "\u019b\7?\2\2\u019b\u0083\3\2\2\2\u019c\u019d\7\'\2\2\u019d\u019e\7?\2"+
+    "\2\u019e\u0085\3\2\2\2\u019f\u01a0\7(\2\2\u01a0\u01a1\7?\2\2\u01a1\u0087"+
+    "\3\2\2\2\u01a2\u01a3\7`\2\2\u01a3\u01a4\7?\2\2\u01a4\u0089\3\2\2\2\u01a5"+
+    "\u01a6\7~\2\2\u01a6\u01a7\7?\2\2\u01a7\u008b\3\2\2\2\u01a8\u01a9\7>\2"+
+    "\2\u01a9\u01aa\7>\2\2\u01aa\u01ab\7?\2\2\u01ab\u008d\3\2\2\2\u01ac\u01ad"+
+    "\7@\2\2\u01ad\u01ae\7@\2\2\u01ae\u01af\7?\2\2\u01af\u008f\3\2\2\2\u01b0"+
+    "\u01b1\7@\2\2\u01b1\u01b2\7@\2\2\u01b2\u01b3\7@\2\2\u01b3\u01b4\7?\2\2"+
+    "\u01b4\u0091\3\2\2\2\u01b5\u01b7\7\62\2\2\u01b6\u01b8\t\4\2\2\u01b7\u01b6"+
+    "\3\2\2\2\u01b8\u01b9\3\2\2\2\u01b9\u01b7\3\2\2\2\u01b9\u01ba\3\2\2\2\u01ba"+
+    "\u01bc\3\2\2\2\u01bb\u01bd\t\5\2\2\u01bc\u01bb\3\2\2\2\u01bc\u01bd\3\2"+
+    "\2\2\u01bd\u0093\3\2\2\2\u01be\u01bf\7\62\2\2\u01bf\u01c1\t\6\2\2\u01c0"+
+    "\u01c2\t\7\2\2\u01c1\u01c0\3\2\2\2\u01c2\u01c3\3\2\2\2\u01c3\u01c1\3\2"+
+    "\2\2\u01c3\u01c4\3\2\2\2\u01c4\u01c6\3\2\2\2\u01c5\u01c7\t\5\2\2\u01c6"+
+    "\u01c5\3\2\2\2\u01c6\u01c7\3\2\2\2\u01c7\u0095\3\2\2\2\u01c8\u01d1\7\62"+
+    "\2\2\u01c9\u01cd\t\b\2\2\u01ca\u01cc\t\t\2\2\u01cb\u01ca\3\2\2\2\u01cc"+
+    "\u01cf\3\2\2\2\u01cd\u01cb\3\2\2\2\u01cd\u01ce\3\2\2\2\u01ce\u01d1\3\2"+
+    "\2\2\u01cf\u01cd\3\2\2\2\u01d0\u01c8\3\2\2\2\u01d0\u01c9\3\2\2\2\u01d1"+
+    "\u01d3\3\2\2\2\u01d2\u01d4\t\n\2\2\u01d3\u01d2\3\2\2\2\u01d3\u01d4\3\2"+
+    "\2\2\u01d4\u0097\3\2\2\2\u01d5\u01de\7\62\2\2\u01d6\u01da\t\b\2\2\u01d7"+
+    "\u01d9\t\t\2\2\u01d8\u01d7\3\2\2\2\u01d9\u01dc\3\2\2\2\u01da\u01d8\3\2"+
+    "\2\2\u01da\u01db\3\2\2\2\u01db\u01de\3\2\2\2\u01dc\u01da\3\2\2\2\u01dd"+
+    "\u01d5\3\2\2\2\u01dd\u01d6\3\2\2\2\u01de\u01e5\3\2\2\2\u01df\u01e1\5\24"+
+    "\n\2\u01e0\u01e2\t\t\2\2\u01e1\u01e0\3\2\2\2\u01e2\u01e3\3\2\2\2\u01e3"+
+    "\u01e1\3\2\2\2\u01e3\u01e4\3\2\2\2\u01e4\u01e6\3\2\2\2\u01e5\u01df\3\2"+
+    "\2\2\u01e5\u01e6\3\2\2\2\u01e6\u01f0\3\2\2\2\u01e7\u01e9\t\13\2\2\u01e8"+
+    "\u01ea\t\f\2\2\u01e9\u01e8\3\2\2\2\u01e9\u01ea\3\2\2\2\u01ea\u01ec\3\2"+
+    "\2\2\u01eb\u01ed\t\t\2\2\u01ec\u01eb\3\2\2\2\u01ed\u01ee\3\2\2\2\u01ee"+
+    "\u01ec\3\2\2\2\u01ee\u01ef\3\2\2\2\u01ef\u01f1\3\2\2\2\u01f0\u01e7\3\2"+
+    "\2\2\u01f0\u01f1\3\2\2\2\u01f1\u01f3\3\2\2\2\u01f2\u01f4\t\r\2\2\u01f3"+
+    "\u01f2\3\2\2\2\u01f3\u01f4\3\2\2\2\u01f4\u0099\3\2\2\2\u01f5\u01fd\7$"+
+    "\2\2\u01f6\u01f7\7^\2\2\u01f7\u01fc\7$\2\2\u01f8\u01f9\7^\2\2\u01f9\u01fc"+
+    "\7^\2\2\u01fa\u01fc\n\16\2\2\u01fb\u01f6\3\2\2\2\u01fb\u01f8\3\2\2\2\u01fb"+
+    "\u01fa\3\2\2\2\u01fc\u01ff\3\2\2\2\u01fd\u01fe\3\2\2\2\u01fd\u01fb\3\2"+
+    "\2\2\u01fe\u0200\3\2\2\2\u01ff\u01fd\3\2\2\2\u0200\u020e\7$\2\2\u0201"+
+    "\u0209\7)\2\2\u0202\u0203\7^\2\2\u0203\u0208\7)\2\2\u0204\u0205\7^\2\2"+
+    "\u0205\u0208\7^\2\2\u0206\u0208\n\16\2\2\u0207\u0202\3\2\2\2\u0207\u0204"+
+    "\3\2\2\2\u0207\u0206\3\2\2\2\u0208\u020b\3\2\2\2\u0209\u020a\3\2\2\2\u0209"+
+    "\u0207\3\2\2\2\u020a\u020c\3\2\2\2\u020b\u0209\3\2\2\2\u020c\u020e\7)"+
+    "\2\2\u020d\u01f5\3\2\2\2\u020d\u0201\3\2\2\2\u020e\u009b\3\2\2\2\u020f"+
+    "\u0213\7\61\2\2\u0210\u0214\n\17\2\2\u0211\u0212\7^\2\2\u0212\u0214\n"+
+    "\20\2\2\u0213\u0210\3\2\2\2\u0213\u0211\3\2\2\2\u0214\u0215\3\2\2\2\u0215"+
+    "\u0213\3\2\2\2\u0215\u0216\3\2\2\2\u0216\u0217\3\2\2\2\u0217\u021b\7\61"+
+    "\2\2\u0218\u021a\t\21\2\2\u0219\u0218\3\2\2\2\u021a\u021d\3\2\2\2\u021b"+
+    "\u0219\3\2\2\2\u021b\u021c\3\2\2\2\u021c\u021e\3\2\2\2\u021d\u021b\3\2"+
+    "\2\2\u021e\u021f\6N\3\2\u021f\u009d\3\2\2\2\u0220\u0221\7v\2\2\u0221\u0222"+
+    "\7t\2\2\u0222\u0223\7w\2\2\u0223\u0224\7g\2\2\u0224\u009f\3\2\2\2\u0225"+
+    "\u0226\7h\2\2\u0226\u0227\7c\2\2\u0227\u0228\7n\2\2\u0228\u0229\7u\2\2"+
+    "\u0229\u022a\7g\2\2\u022a\u00a1\3\2\2\2\u022b\u022c\7p\2\2\u022c\u022d"+
+    "\7w\2\2\u022d\u022e\7n\2\2\u022e\u022f\7n\2\2\u022f\u00a3\3\2\2\2\u0230"+
+    "\u0236\5\u00a6S\2\u0231\u0232\5\24\n\2\u0232\u0233\5\u00a6S\2\u0233\u0235"+
+    "\3\2\2\2\u0234\u0231\3\2\2\2\u0235\u0238\3\2\2\2\u0236\u0234\3\2\2\2\u0236"+
+    "\u0237\3\2\2\2\u0237\u0239\3\2\2\2\u0238\u0236\3\2\2\2\u0239\u023a\6R"+
+    "\4\2\u023a\u00a5\3\2\2\2\u023b\u023f\t\22\2\2\u023c\u023e\t\23\2\2\u023d"+
+    "\u023c\3\2\2\2\u023e\u0241\3\2\2\2\u023f\u023d\3\2\2\2\u023f\u0240\3\2"+
+    "\2\2\u0240\u00a7\3\2\2\2\u0241\u023f\3\2\2\2\u0242\u024b\7\62\2\2\u0243"+
+    "\u0247\t\b\2\2\u0244\u0246\t\t\2\2\u0245\u0244\3\2\2\2\u0246\u0249\3\2"+
+    "\2\2\u0247\u0245\3\2\2\2\u0247\u0248\3\2\2\2\u0248\u024b\3\2\2\2\u0249"+
+    "\u0247\3\2\2\2\u024a\u0242\3\2\2\2\u024a\u0243\3\2\2\2\u024b\u024c\3\2"+
+    "\2\2\u024c\u024d\bT\4\2\u024d\u00a9\3\2\2\2\u024e\u0252\t\22\2\2\u024f"+
+    "\u0251\t\23\2\2\u0250\u024f\3\2\2\2\u0251\u0254\3\2\2\2\u0252\u0250\3"+
+    "\2\2\2\u0252\u0253\3\2\2\2\u0253\u0255\3\2\2\2\u0254\u0252\3\2\2\2\u0255"+
+    "\u0256\bU\4\2\u0256\u00ab\3\2\2\2$\2\3\u00af\u00b9\u00c3\u00c8\u01b9\u01bc"+
+    "\u01c3\u01c6\u01cd\u01d0\u01d3\u01da\u01dd\u01e3\u01e5\u01e9\u01ee\u01f0"+
+    "\u01f3\u01fb\u01fd\u0207\u0209\u020d\u0213\u0215\u021b\u0236\u023f\u0247"+
+    "\u024a\u0252\5\b\2\2\4\3\2\4\2\2";
   public static final ATN _ATN =
     new ATNDeserializer().deserialize(_serializedATN.toCharArray());
   static {
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessParser.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessParser.java
index 964ef714838..619c582d04a 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessParser.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessParser.java
@@ -18,16 +18,16 @@ class PainlessParser extends Parser {
     new PredictionContextCache();
   public static final int
     WS=1, COMMENT=2, LBRACK=3, RBRACK=4, LBRACE=5, RBRACE=6, LP=7, RP=8, DOT=9, 
-    COMMA=10, SEMICOLON=11, IF=12, IN=13, ELSE=14, WHILE=15, DO=16, FOR=17, 
-    CONTINUE=18, BREAK=19, RETURN=20, NEW=21, TRY=22, CATCH=23, THROW=24, 
-    THIS=25, INSTANCEOF=26, BOOLNOT=27, BWNOT=28, MUL=29, DIV=30, REM=31, 
-    ADD=32, SUB=33, LSH=34, RSH=35, USH=36, LT=37, LTE=38, GT=39, GTE=40, 
-    EQ=41, EQR=42, NE=43, NER=44, BWAND=45, XOR=46, BWOR=47, BOOLAND=48, BOOLOR=49, 
-    COND=50, COLON=51, REF=52, ARROW=53, FIND=54, MATCH=55, INCR=56, DECR=57, 
-    ASSIGN=58, AADD=59, ASUB=60, AMUL=61, ADIV=62, AREM=63, AAND=64, AXOR=65, 
-    AOR=66, ALSH=67, ARSH=68, AUSH=69, OCTAL=70, HEX=71, INTEGER=72, DECIMAL=73, 
-    STRING=74, REGEX=75, TRUE=76, FALSE=77, NULL=78, TYPE=79, ID=80, DOTINTEGER=81, 
-    DOTID=82;
+    NSDOT=10, COMMA=11, SEMICOLON=12, IF=13, IN=14, ELSE=15, WHILE=16, DO=17, 
+    FOR=18, CONTINUE=19, BREAK=20, RETURN=21, NEW=22, TRY=23, CATCH=24, THROW=25, 
+    THIS=26, INSTANCEOF=27, BOOLNOT=28, BWNOT=29, MUL=30, DIV=31, REM=32, 
+    ADD=33, SUB=34, LSH=35, RSH=36, USH=37, LT=38, LTE=39, GT=40, GTE=41, 
+    EQ=42, EQR=43, NE=44, NER=45, BWAND=46, XOR=47, BWOR=48, BOOLAND=49, BOOLOR=50, 
+    COND=51, COLON=52, ELVIS=53, REF=54, ARROW=55, FIND=56, MATCH=57, INCR=58, 
+    DECR=59, ASSIGN=60, AADD=61, ASUB=62, AMUL=63, ADIV=64, AREM=65, AAND=66, 
+    AXOR=67, AOR=68, ALSH=69, ARSH=70, AUSH=71, OCTAL=72, HEX=73, INTEGER=74, 
+    DECIMAL=75, STRING=76, REGEX=77, TRUE=78, FALSE=79, NULL=80, TYPE=81, 
+    ID=82, DOTINTEGER=83, DOTID=84;
   public static final int
     RULE_source = 0, RULE_function = 1, RULE_parameters = 2, RULE_statement = 3, 
     RULE_trailer = 4, RULE_block = 5, RULE_empty = 6, RULE_initializer = 7, 
@@ -48,27 +48,27 @@ class PainlessParser extends Parser {
   };
 
   private static final String[] _LITERAL_NAMES = {
-    null, null, null, "'{'", "'}'", "'['", "']'", "'('", "')'", "'.'", "','", 
-    "';'", "'if'", "'in'", "'else'", "'while'", "'do'", "'for'", "'continue'", 
+    null, null, null, "'{'", "'}'", "'['", "']'", "'('", "')'", "'.'", "'?.'", 
+    "','", "';'", "'if'", "'in'", "'else'", "'while'", "'do'", "'for'", "'continue'", 
     "'break'", "'return'", "'new'", "'try'", "'catch'", "'throw'", "'this'", 
     "'instanceof'", "'!'", "'~'", "'*'", "'/'", "'%'", "'+'", "'-'", "'<<'", 
     "'>>'", "'>>>'", "'<'", "'<='", "'>'", "'>='", "'=='", "'==='", "'!='", 
-    "'!=='", "'&'", "'^'", "'|'", "'&&'", "'||'", "'?'", "':'", "'::'", "'->'", 
-    "'=~'", "'==~'", "'++'", "'--'", "'='", "'+='", "'-='", "'*='", "'/='", 
-    "'%='", "'&='", "'^='", "'|='", "'<<='", "'>>='", "'>>>='", null, null, 
-    null, null, null, null, "'true'", "'false'", "'null'"
+    "'!=='", "'&'", "'^'", "'|'", "'&&'", "'||'", "'?'", "':'", "'?:'", "'::'", 
+    "'->'", "'=~'", "'==~'", "'++'", "'--'", "'='", "'+='", "'-='", "'*='", 
+    "'/='", "'%='", "'&='", "'^='", "'|='", "'<<='", "'>>='", "'>>>='", null, 
+    null, null, null, null, null, "'true'", "'false'", "'null'"
   };
   private static final String[] _SYMBOLIC_NAMES = {
     null, "WS", "COMMENT", "LBRACK", "RBRACK", "LBRACE", "RBRACE", "LP", "RP", 
-    "DOT", "COMMA", "SEMICOLON", "IF", "IN", "ELSE", "WHILE", "DO", "FOR", 
-    "CONTINUE", "BREAK", "RETURN", "NEW", "TRY", "CATCH", "THROW", "THIS", 
-    "INSTANCEOF", "BOOLNOT", "BWNOT", "MUL", "DIV", "REM", "ADD", "SUB", "LSH", 
-    "RSH", "USH", "LT", "LTE", "GT", "GTE", "EQ", "EQR", "NE", "NER", "BWAND", 
-    "XOR", "BWOR", "BOOLAND", "BOOLOR", "COND", "COLON", "REF", "ARROW", "FIND", 
-    "MATCH", "INCR", "DECR", "ASSIGN", "AADD", "ASUB", "AMUL", "ADIV", "AREM", 
-    "AAND", "AXOR", "AOR", "ALSH", "ARSH", "AUSH", "OCTAL", "HEX", "INTEGER", 
-    "DECIMAL", "STRING", "REGEX", "TRUE", "FALSE", "NULL", "TYPE", "ID", "DOTINTEGER", 
-    "DOTID"
+    "DOT", "NSDOT", "COMMA", "SEMICOLON", "IF", "IN", "ELSE", "WHILE", "DO", 
+    "FOR", "CONTINUE", "BREAK", "RETURN", "NEW", "TRY", "CATCH", "THROW", 
+    "THIS", "INSTANCEOF", "BOOLNOT", "BWNOT", "MUL", "DIV", "REM", "ADD", 
+    "SUB", "LSH", "RSH", "USH", "LT", "LTE", "GT", "GTE", "EQ", "EQR", "NE", 
+    "NER", "BWAND", "XOR", "BWOR", "BOOLAND", "BOOLOR", "COND", "COLON", "ELVIS", 
+    "REF", "ARROW", "FIND", "MATCH", "INCR", "DECR", "ASSIGN", "AADD", "ASUB", 
+    "AMUL", "ADIV", "AREM", "AAND", "AXOR", "AOR", "ALSH", "ARSH", "AUSH", 
+    "OCTAL", "HEX", "INTEGER", "DECIMAL", "STRING", "REGEX", "TRUE", "FALSE", 
+    "NULL", "TYPE", "ID", "DOTINTEGER", "DOTID"
   };
   public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
 
@@ -171,7 +171,7 @@ class PainlessParser extends Parser {
       setState(73);
       _errHandler.sync(this);
       _la = _input.LA(1);
-      while ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << LBRACE) | (1L << LP) | (1L << IF) | (1L << WHILE) | (1L << DO) | (1L << FOR) | (1L << CONTINUE) | (1L << BREAK) | (1L << RETURN) | (1L << NEW) | (1L << TRY) | (1L << THROW) | (1L << BOOLNOT) | (1L << BWNOT) | (1L << ADD) | (1L << SUB) | (1L << INCR) | (1L << DECR))) != 0) || ((((_la - 70)) & ~0x3f) == 0 && ((1L << (_la - 70)) & ((1L << (OCTAL - 70)) | (1L << (HEX - 70)) | (1L << (INTEGER - 70)) | (1L << (DECIMAL - 70)) | (1L << (STRING - 70)) | (1L << (REGEX - 70)) | (1L << (TRUE - 70)) | (1L << (FALSE - 70)) | (1L << (NULL - 70)) | (1L << (TYPE - 70)) | (1L << (ID - 70)))) != 0)) {
+      while ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << LBRACE) | (1L << LP) | (1L << IF) | (1L << WHILE) | (1L << DO) | (1L << FOR) | (1L << CONTINUE) | (1L << BREAK) | (1L << RETURN) | (1L << NEW) | (1L << TRY) | (1L << THROW) | (1L << BOOLNOT) | (1L << BWNOT) | (1L << ADD) | (1L << SUB) | (1L << INCR) | (1L << DECR))) != 0) || ((((_la - 72)) & ~0x3f) == 0 && ((1L << (_la - 72)) & ((1L << (OCTAL - 72)) | (1L << (HEX - 72)) | (1L << (INTEGER - 72)) | (1L << (DECIMAL - 72)) | (1L << (STRING - 72)) | (1L << (REGEX - 72)) | (1L << (TRUE - 72)) | (1L << (FALSE - 72)) | (1L << (NULL - 72)) | (1L << (TYPE - 72)) | (1L << (ID - 72)))) != 0)) {
         {
         {
         setState(70);
@@ -703,7 +703,7 @@ class PainlessParser extends Parser {
         match(LP);
         setState(128);
         _la = _input.LA(1);
-        if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << LBRACE) | (1L << LP) | (1L << NEW) | (1L << BOOLNOT) | (1L << BWNOT) | (1L << ADD) | (1L << SUB) | (1L << INCR) | (1L << DECR))) != 0) || ((((_la - 70)) & ~0x3f) == 0 && ((1L << (_la - 70)) & ((1L << (OCTAL - 70)) | (1L << (HEX - 70)) | (1L << (INTEGER - 70)) | (1L << (DECIMAL - 70)) | (1L << (STRING - 70)) | (1L << (REGEX - 70)) | (1L << (TRUE - 70)) | (1L << (FALSE - 70)) | (1L << (NULL - 70)) | (1L << (TYPE - 70)) | (1L << (ID - 70)))) != 0)) {
+        if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << LBRACE) | (1L << LP) | (1L << NEW) | (1L << BOOLNOT) | (1L << BWNOT) | (1L << ADD) | (1L << SUB) | (1L << INCR) | (1L << DECR))) != 0) || ((((_la - 72)) & ~0x3f) == 0 && ((1L << (_la - 72)) & ((1L << (OCTAL - 72)) | (1L << (HEX - 72)) | (1L << (INTEGER - 72)) | (1L << (DECIMAL - 72)) | (1L << (STRING - 72)) | (1L << (REGEX - 72)) | (1L << (TRUE - 72)) | (1L << (FALSE - 72)) | (1L << (NULL - 72)) | (1L << (TYPE - 72)) | (1L << (ID - 72)))) != 0)) {
           {
           setState(127);
           initializer();
@@ -714,7 +714,7 @@ class PainlessParser extends Parser {
         match(SEMICOLON);
         setState(132);
         _la = _input.LA(1);
-        if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << LBRACE) | (1L << LP) | (1L << NEW) | (1L << BOOLNOT) | (1L << BWNOT) | (1L << ADD) | (1L << SUB) | (1L << INCR) | (1L << DECR))) != 0) || ((((_la - 70)) & ~0x3f) == 0 && ((1L << (_la - 70)) & ((1L << (OCTAL - 70)) | (1L << (HEX - 70)) | (1L << (INTEGER - 70)) | (1L << (DECIMAL - 70)) | (1L << (STRING - 70)) | (1L << (REGEX - 70)) | (1L << (TRUE - 70)) | (1L << (FALSE - 70)) | (1L << (NULL - 70)) | (1L << (TYPE - 70)) | (1L << (ID - 70)))) != 0)) {
+        if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << LBRACE) | (1L << LP) | (1L << NEW) | (1L << BOOLNOT) | (1L << BWNOT) | (1L << ADD) | (1L << SUB) | (1L << INCR) | (1L << DECR))) != 0) || ((((_la - 72)) & ~0x3f) == 0 && ((1L << (_la - 72)) & ((1L << (OCTAL - 72)) | (1L << (HEX - 72)) | (1L << (INTEGER - 72)) | (1L << (DECIMAL - 72)) | (1L << (STRING - 72)) | (1L << (REGEX - 72)) | (1L << (TRUE - 72)) | (1L << (FALSE - 72)) | (1L << (NULL - 72)) | (1L << (TYPE - 72)) | (1L << (ID - 72)))) != 0)) {
           {
           setState(131);
           expression(0);
@@ -725,7 +725,7 @@ class PainlessParser extends Parser {
         match(SEMICOLON);
         setState(136);
         _la = _input.LA(1);
-        if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << LBRACE) | (1L << LP) | (1L << NEW) | (1L << BOOLNOT) | (1L << BWNOT) | (1L << ADD) | (1L << SUB) | (1L << INCR) | (1L << DECR))) != 0) || ((((_la - 70)) & ~0x3f) == 0 && ((1L << (_la - 70)) & ((1L << (OCTAL - 70)) | (1L << (HEX - 70)) | (1L << (INTEGER - 70)) | (1L << (DECIMAL - 70)) | (1L << (STRING - 70)) | (1L << (REGEX - 70)) | (1L << (TRUE - 70)) | (1L << (FALSE - 70)) | (1L << (NULL - 70)) | (1L << (TYPE - 70)) | (1L << (ID - 70)))) != 0)) {
+        if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << LBRACE) | (1L << LP) | (1L << NEW) | (1L << BOOLNOT) | (1L << BWNOT) | (1L << ADD) | (1L << SUB) | (1L << INCR) | (1L << DECR))) != 0) || ((((_la - 72)) & ~0x3f) == 0 && ((1L << (_la - 72)) & ((1L << (OCTAL - 72)) | (1L << (HEX - 72)) | (1L << (INTEGER - 72)) | (1L << (DECIMAL - 72)) | (1L << (STRING - 72)) | (1L << (REGEX - 72)) | (1L << (TRUE - 72)) | (1L << (FALSE - 72)) | (1L << (NULL - 72)) | (1L << (TYPE - 72)) | (1L << (ID - 72)))) != 0)) {
           {
           setState(135);
           afterthought();
@@ -1044,7 +1044,7 @@ class PainlessParser extends Parser {
       setState(195);
       _errHandler.sync(this);
       _la = _input.LA(1);
-      while ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << LBRACE) | (1L << LP) | (1L << IF) | (1L << WHILE) | (1L << DO) | (1L << FOR) | (1L << CONTINUE) | (1L << BREAK) | (1L << RETURN) | (1L << NEW) | (1L << TRY) | (1L << THROW) | (1L << BOOLNOT) | (1L << BWNOT) | (1L << ADD) | (1L << SUB) | (1L << INCR) | (1L << DECR))) != 0) || ((((_la - 70)) & ~0x3f) == 0 && ((1L << (_la - 70)) & ((1L << (OCTAL - 70)) | (1L << (HEX - 70)) | (1L << (INTEGER - 70)) | (1L << (DECIMAL - 70)) | (1L << (STRING - 70)) | (1L << (REGEX - 70)) | (1L << (TRUE - 70)) | (1L << (FALSE - 70)) | (1L << (NULL - 70)) | (1L << (TYPE - 70)) | (1L << (ID - 70)))) != 0)) {
+      while ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << LBRACE) | (1L << LP) | (1L << IF) | (1L << WHILE) | (1L << DO) | (1L << FOR) | (1L << CONTINUE) | (1L << BREAK) | (1L << RETURN) | (1L << NEW) | (1L << TRY) | (1L << THROW) | (1L << BOOLNOT) | (1L << BWNOT) | (1L << ADD) | (1L << SUB) | (1L << INCR) | (1L << DECR))) != 0) || ((((_la - 72)) & ~0x3f) == 0 && ((1L << (_la - 72)) & ((1L << (OCTAL - 72)) | (1L << (HEX - 72)) | (1L << (INTEGER - 72)) | (1L << (DECIMAL - 72)) | (1L << (STRING - 72)) | (1L << (REGEX - 72)) | (1L << (TRUE - 72)) | (1L << (FALSE - 72)) | (1L << (NULL - 72)) | (1L << (TYPE - 72)) | (1L << (ID - 72)))) != 0)) {
         {
         {
         setState(192);
@@ -1588,6 +1588,21 @@ class PainlessParser extends Parser {
       else return visitor.visitChildren(this);
     }
   }
+  public static class ElvisContext extends ExpressionContext {
+    public List<ExpressionContext> expression() {
+      return getRuleContexts(ExpressionContext.class);
+    }
+    public ExpressionContext expression(int i) {
+      return getRuleContext(ExpressionContext.class,i);
+    }
+    public TerminalNode ELVIS() { return getToken(PainlessParser.ELVIS, 0); }
+    public ElvisContext(ExpressionContext ctx) { copyFrom(ctx); }
+    @Override
+    public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+      if ( visitor instanceof PainlessParserVisitor ) return ((PainlessParserVisitor<? extends T>)visitor).visitElvis(this);
+      else return visitor.visitChildren(this);
+    }
+  }
   public static class InstanceofContext extends ExpressionContext {
     public ExpressionContext expression() {
       return getRuleContext(ExpressionContext.class,0);
@@ -1629,7 +1644,7 @@ class PainlessParser extends Parser {
       unary();
       }
       _ctx.stop = _input.LT(-1);
-      setState(289);
+      setState(292);
       _errHandler.sync(this);
       _alt = getInterpreter().adaptivePredict(_input,19,_ctx);
       while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
@@ -1637,14 +1652,14 @@ class PainlessParser extends Parser {
           if ( _parseListeners!=null ) triggerExitRuleEvent();
           _prevctx = _localctx;
           {
-          setState(287);
+          setState(290);
           switch ( getInterpreter().adaptivePredict(_input,18,_ctx) ) {
           case 1:
             {
             _localctx = new BinaryContext(new ExpressionContext(_parentctx, _parentState));
             pushNewRecursionContext(_localctx, _startState, RULE_expression);
             setState(242);
-            if (!(precpred(_ctx, 14))) throw new FailedPredicateException(this, "precpred(_ctx, 14)");
+            if (!(precpred(_ctx, 15))) throw new FailedPredicateException(this, "precpred(_ctx, 15)");
             setState(243);
             _la = _input.LA(1);
             if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << MUL) | (1L << DIV) | (1L << REM))) != 0)) ) {
@@ -1653,7 +1668,7 @@ class PainlessParser extends Parser {
               consume();
             }
             setState(244);
-            expression(15);
+            expression(16);
             }
             break;
           case 2:
@@ -1661,7 +1676,7 @@ class PainlessParser extends Parser {
             _localctx = new BinaryContext(new ExpressionContext(_parentctx, _parentState));
             pushNewRecursionContext(_localctx, _startState, RULE_expression);
             setState(245);
-            if (!(precpred(_ctx, 13))) throw new FailedPredicateException(this, "precpred(_ctx, 13)");
+            if (!(precpred(_ctx, 14))) throw new FailedPredicateException(this, "precpred(_ctx, 14)");
             setState(246);
             _la = _input.LA(1);
             if ( !(_la==ADD || _la==SUB) ) {
@@ -1670,7 +1685,7 @@ class PainlessParser extends Parser {
               consume();
             }
             setState(247);
-            expression(14);
+            expression(15);
             }
             break;
           case 3:
@@ -1678,7 +1693,7 @@ class PainlessParser extends Parser {
             _localctx = new BinaryContext(new ExpressionContext(_parentctx, _parentState));
             pushNewRecursionContext(_localctx, _startState, RULE_expression);
             setState(248);
-            if (!(precpred(_ctx, 12))) throw new FailedPredicateException(this, "precpred(_ctx, 12)");
+            if (!(precpred(_ctx, 13))) throw new FailedPredicateException(this, "precpred(_ctx, 13)");
             setState(249);
             _la = _input.LA(1);
             if ( !(_la==FIND || _la==MATCH) ) {
@@ -1687,7 +1702,7 @@ class PainlessParser extends Parser {
               consume();
             }
             setState(250);
-            expression(13);
+            expression(14);
             }
             break;
           case 4:
@@ -1695,7 +1710,7 @@ class PainlessParser extends Parser {
             _localctx = new BinaryContext(new ExpressionContext(_parentctx, _parentState));
             pushNewRecursionContext(_localctx, _startState, RULE_expression);
             setState(251);
-            if (!(precpred(_ctx, 11))) throw new FailedPredicateException(this, "precpred(_ctx, 11)");
+            if (!(precpred(_ctx, 12))) throw new FailedPredicateException(this, "precpred(_ctx, 12)");
             setState(252);
             _la = _input.LA(1);
             if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << LSH) | (1L << RSH) | (1L << USH))) != 0)) ) {
@@ -1704,7 +1719,7 @@ class PainlessParser extends Parser {
               consume();
             }
             setState(253);
-            expression(12);
+            expression(13);
             }
             break;
           case 5:
@@ -1712,7 +1727,7 @@ class PainlessParser extends Parser {
             _localctx = new CompContext(new ExpressionContext(_parentctx, _parentState));
             pushNewRecursionContext(_localctx, _startState, RULE_expression);
             setState(254);
-            if (!(precpred(_ctx, 10))) throw new FailedPredicateException(this, "precpred(_ctx, 10)");
+            if (!(precpred(_ctx, 11))) throw new FailedPredicateException(this, "precpred(_ctx, 11)");
             setState(255);
             _la = _input.LA(1);
             if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << LT) | (1L << LTE) | (1L << GT) | (1L << GTE))) != 0)) ) {
@@ -1721,7 +1736,7 @@ class PainlessParser extends Parser {
               consume();
             }
             setState(256);
-            expression(11);
+            expression(12);
             }
             break;
           case 6:
@@ -1729,7 +1744,7 @@ class PainlessParser extends Parser {
             _localctx = new CompContext(new ExpressionContext(_parentctx, _parentState));
             pushNewRecursionContext(_localctx, _startState, RULE_expression);
             setState(257);
-            if (!(precpred(_ctx, 8))) throw new FailedPredicateException(this, "precpred(_ctx, 8)");
+            if (!(precpred(_ctx, 9))) throw new FailedPredicateException(this, "precpred(_ctx, 9)");
             setState(258);
             _la = _input.LA(1);
             if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << EQ) | (1L << EQR) | (1L << NE) | (1L << NER))) != 0)) ) {
@@ -1738,7 +1753,7 @@ class PainlessParser extends Parser {
               consume();
             }
             setState(259);
-            expression(9);
+            expression(10);
             }
             break;
           case 7:
@@ -1746,11 +1761,11 @@ class PainlessParser extends Parser {
             _localctx = new BinaryContext(new ExpressionContext(_parentctx, _parentState));
             pushNewRecursionContext(_localctx, _startState, RULE_expression);
             setState(260);
-            if (!(precpred(_ctx, 7))) throw new FailedPredicateException(this, "precpred(_ctx, 7)");
+            if (!(precpred(_ctx, 8))) throw new FailedPredicateException(this, "precpred(_ctx, 8)");
             setState(261);
             match(BWAND);
             setState(262);
-            expression(8);
+            expression(9);
             }
             break;
           case 8:
@@ -1758,11 +1773,11 @@ class PainlessParser extends Parser {
             _localctx = new BinaryContext(new ExpressionContext(_parentctx, _parentState));
             pushNewRecursionContext(_localctx, _startState, RULE_expression);
             setState(263);
-            if (!(precpred(_ctx, 6))) throw new FailedPredicateException(this, "precpred(_ctx, 6)");
+            if (!(precpred(_ctx, 7))) throw new FailedPredicateException(this, "precpred(_ctx, 7)");
             setState(264);
             match(XOR);
             setState(265);
-            expression(7);
+            expression(8);
             }
             break;
           case 9:
@@ -1770,11 +1785,11 @@ class PainlessParser extends Parser {
             _localctx = new BinaryContext(new ExpressionContext(_parentctx, _parentState));
             pushNewRecursionContext(_localctx, _startState, RULE_expression);
             setState(266);
-            if (!(precpred(_ctx, 5))) throw new FailedPredicateException(this, "precpred(_ctx, 5)");
+            if (!(precpred(_ctx, 6))) throw new FailedPredicateException(this, "precpred(_ctx, 6)");
             setState(267);
             match(BWOR);
             setState(268);
-            expression(6);
+            expression(7);
             }
             break;
           case 10:
@@ -1782,11 +1797,11 @@ class PainlessParser extends Parser {
             _localctx = new BoolContext(new ExpressionContext(_parentctx, _parentState));
             pushNewRecursionContext(_localctx, _startState, RULE_expression);
             setState(269);
-            if (!(precpred(_ctx, 4))) throw new FailedPredicateException(this, "precpred(_ctx, 4)");
+            if (!(precpred(_ctx, 5))) throw new FailedPredicateException(this, "precpred(_ctx, 5)");
             setState(270);
             match(BOOLAND);
             setState(271);
-            expression(5);
+            expression(6);
             }
             break;
           case 11:
@@ -1794,11 +1809,11 @@ class PainlessParser extends Parser {
             _localctx = new BoolContext(new ExpressionContext(_parentctx, _parentState));
             pushNewRecursionContext(_localctx, _startState, RULE_expression);
             setState(272);
-            if (!(precpred(_ctx, 3))) throw new FailedPredicateException(this, "precpred(_ctx, 3)");
+            if (!(precpred(_ctx, 4))) throw new FailedPredicateException(this, "precpred(_ctx, 4)");
             setState(273);
             match(BOOLOR);
             setState(274);
-            expression(4);
+            expression(5);
             }
             break;
           case 12:
@@ -1806,7 +1821,7 @@ class PainlessParser extends Parser {
             _localctx = new ConditionalContext(new ExpressionContext(_parentctx, _parentState));
             pushNewRecursionContext(_localctx, _startState, RULE_expression);
             setState(275);
-            if (!(precpred(_ctx, 2))) throw new FailedPredicateException(this, "precpred(_ctx, 2)");
+            if (!(precpred(_ctx, 3))) throw new FailedPredicateException(this, "precpred(_ctx, 3)");
             setState(276);
             match(COND);
             setState(277);
@@ -1814,42 +1829,54 @@ class PainlessParser extends Parser {
             setState(278);
             match(COLON);
             setState(279);
-            expression(2);
+            expression(3);
             }
             break;
           case 13:
             {
-            _localctx = new AssignmentContext(new ExpressionContext(_parentctx, _parentState));
+            _localctx = new ElvisContext(new ExpressionContext(_parentctx, _parentState));
             pushNewRecursionContext(_localctx, _startState, RULE_expression);
             setState(281);
-            if (!(precpred(_ctx, 1))) throw new FailedPredicateException(this, "precpred(_ctx, 1)");
+            if (!(precpred(_ctx, 2))) throw new FailedPredicateException(this, "precpred(_ctx, 2)");
             setState(282);
-            _la = _input.LA(1);
-            if ( !(((((_la - 58)) & ~0x3f) == 0 && ((1L << (_la - 58)) & ((1L << (ASSIGN - 58)) | (1L << (AADD - 58)) | (1L << (ASUB - 58)) | (1L << (AMUL - 58)) | (1L << (ADIV - 58)) | (1L << (AREM - 58)) | (1L << (AAND - 58)) | (1L << (AXOR - 58)) | (1L << (AOR - 58)) | (1L << (ALSH - 58)) | (1L << (ARSH - 58)) | (1L << (AUSH - 58)))) != 0)) ) {
-            _errHandler.recoverInline(this);
-            } else {
-              consume();
-            }
+            match(ELVIS);
             setState(283);
-            expression(1);
+            expression(2);
             }
             break;
           case 14:
             {
-            _localctx = new InstanceofContext(new ExpressionContext(_parentctx, _parentState));
+            _localctx = new AssignmentContext(new ExpressionContext(_parentctx, _parentState));
             pushNewRecursionContext(_localctx, _startState, RULE_expression);
             setState(284);
-            if (!(precpred(_ctx, 9))) throw new FailedPredicateException(this, "precpred(_ctx, 9)");
+            if (!(precpred(_ctx, 1))) throw new FailedPredicateException(this, "precpred(_ctx, 1)");
             setState(285);
-            match(INSTANCEOF);
+            _la = _input.LA(1);
+            if ( !(((((_la - 60)) & ~0x3f) == 0 && ((1L << (_la - 60)) & ((1L << (ASSIGN - 60)) | (1L << (AADD - 60)) | (1L << (ASUB - 60)) | (1L << (AMUL - 60)) | (1L << (ADIV - 60)) | (1L << (AREM - 60)) | (1L << (AAND - 60)) | (1L << (AXOR - 60)) | (1L << (AOR - 60)) | (1L << (ALSH - 60)) | (1L << (ARSH - 60)) | (1L << (AUSH - 60)))) != 0)) ) {
+            _errHandler.recoverInline(this);
+            } else {
+              consume();
+            }
             setState(286);
+            expression(1);
+            }
+            break;
+          case 15:
+            {
+            _localctx = new InstanceofContext(new ExpressionContext(_parentctx, _parentState));
+            pushNewRecursionContext(_localctx, _startState, RULE_expression);
+            setState(287);
+            if (!(precpred(_ctx, 10))) throw new FailedPredicateException(this, "precpred(_ctx, 10)");
+            setState(288);
+            match(INSTANCEOF);
+            setState(289);
             decltype();
             }
             break;
           }
           } 
         }
-        setState(291);
+        setState(294);
         _errHandler.sync(this);
         _alt = getInterpreter().adaptivePredict(_input,19,_ctx);
       }
@@ -1951,20 +1978,20 @@ class PainlessParser extends Parser {
     enterRule(_localctx, 30, RULE_unary);
     int _la;
     try {
-      setState(305);
+      setState(308);
       switch ( getInterpreter().adaptivePredict(_input,20,_ctx) ) {
       case 1:
         _localctx = new PreContext(_localctx);
         enterOuterAlt(_localctx, 1);
         {
-        setState(292);
+        setState(295);
         _la = _input.LA(1);
         if ( !(_la==INCR || _la==DECR) ) {
         _errHandler.recoverInline(this);
         } else {
           consume();
         }
-        setState(293);
+        setState(296);
         chain();
         }
         break;
@@ -1972,9 +1999,9 @@ class PainlessParser extends Parser {
         _localctx = new PostContext(_localctx);
         enterOuterAlt(_localctx, 2);
         {
-        setState(294);
+        setState(297);
         chain();
-        setState(295);
+        setState(298);
         _la = _input.LA(1);
         if ( !(_la==INCR || _la==DECR) ) {
         _errHandler.recoverInline(this);
@@ -1987,7 +2014,7 @@ class PainlessParser extends Parser {
         _localctx = new ReadContext(_localctx);
         enterOuterAlt(_localctx, 3);
         {
-        setState(297);
+        setState(300);
         chain();
         }
         break;
@@ -1995,14 +2022,14 @@ class PainlessParser extends Parser {
         _localctx = new OperatorContext(_localctx);
         enterOuterAlt(_localctx, 4);
         {
-        setState(298);
+        setState(301);
         _la = _input.LA(1);
         if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << BOOLNOT) | (1L << BWNOT) | (1L << ADD) | (1L << SUB))) != 0)) ) {
         _errHandler.recoverInline(this);
         } else {
           consume();
         }
-        setState(299);
+        setState(302);
         unary();
         }
         break;
@@ -2010,13 +2037,13 @@ class PainlessParser extends Parser {
         _localctx = new CastContext(_localctx);
         enterOuterAlt(_localctx, 5);
         {
-        setState(300);
-        match(LP);
-        setState(301);
-        decltype();
-        setState(302);
-        match(RP);
         setState(303);
+        match(LP);
+        setState(304);
+        decltype();
+        setState(305);
+        match(RP);
+        setState(306);
         unary();
         }
         break;
@@ -2098,27 +2125,27 @@ class PainlessParser extends Parser {
     enterRule(_localctx, 32, RULE_chain);
     try {
       int _alt;
-      setState(323);
+      setState(326);
       switch ( getInterpreter().adaptivePredict(_input,23,_ctx) ) {
       case 1:
         _localctx = new DynamicContext(_localctx);
         enterOuterAlt(_localctx, 1);
         {
-        setState(307);
+        setState(310);
         primary();
-        setState(311);
+        setState(314);
         _errHandler.sync(this);
         _alt = getInterpreter().adaptivePredict(_input,21,_ctx);
         while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
           if ( _alt==1 ) {
             {
             {
-            setState(308);
+            setState(311);
             postfix();
             }
             } 
           }
-          setState(313);
+          setState(316);
           _errHandler.sync(this);
           _alt = getInterpreter().adaptivePredict(_input,21,_ctx);
         }
@@ -2128,23 +2155,23 @@ class PainlessParser extends Parser {
         _localctx = new StaticContext(_localctx);
         enterOuterAlt(_localctx, 2);
         {
-        setState(314);
+        setState(317);
         decltype();
-        setState(315);
+        setState(318);
         postdot();
-        setState(319);
+        setState(322);
         _errHandler.sync(this);
         _alt = getInterpreter().adaptivePredict(_input,22,_ctx);
         while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
           if ( _alt==1 ) {
             {
             {
-            setState(316);
+            setState(319);
             postfix();
             }
             } 
           }
-          setState(321);
+          setState(324);
           _errHandler.sync(this);
           _alt = getInterpreter().adaptivePredict(_input,22,_ctx);
         }
@@ -2154,7 +2181,7 @@ class PainlessParser extends Parser {
         _localctx = new NewarrayContext(_localctx);
         enterOuterAlt(_localctx, 3);
         {
-        setState(322);
+        setState(325);
         arrayinitializer();
         }
         break;
@@ -2314,17 +2341,17 @@ class PainlessParser extends Parser {
     enterRule(_localctx, 34, RULE_primary);
     int _la;
     try {
-      setState(343);
+      setState(346);
       switch ( getInterpreter().adaptivePredict(_input,24,_ctx) ) {
       case 1:
         _localctx = new PrecedenceContext(_localctx);
         enterOuterAlt(_localctx, 1);
         {
-        setState(325);
+        setState(328);
         match(LP);
-        setState(326);
+        setState(329);
         expression(0);
-        setState(327);
+        setState(330);
         match(RP);
         }
         break;
@@ -2332,9 +2359,9 @@ class PainlessParser extends Parser {
         _localctx = new NumericContext(_localctx);
         enterOuterAlt(_localctx, 2);
         {
-        setState(329);
+        setState(332);
         _la = _input.LA(1);
-        if ( !(((((_la - 70)) & ~0x3f) == 0 && ((1L << (_la - 70)) & ((1L << (OCTAL - 70)) | (1L << (HEX - 70)) | (1L << (INTEGER - 70)) | (1L << (DECIMAL - 70)))) != 0)) ) {
+        if ( !(((((_la - 72)) & ~0x3f) == 0 && ((1L << (_la - 72)) & ((1L << (OCTAL - 72)) | (1L << (HEX - 72)) | (1L << (INTEGER - 72)) | (1L << (DECIMAL - 72)))) != 0)) ) {
         _errHandler.recoverInline(this);
         } else {
           consume();
@@ -2345,7 +2372,7 @@ class PainlessParser extends Parser {
         _localctx = new TrueContext(_localctx);
         enterOuterAlt(_localctx, 3);
         {
-        setState(330);
+        setState(333);
         match(TRUE);
         }
         break;
@@ -2353,7 +2380,7 @@ class PainlessParser extends Parser {
         _localctx = new FalseContext(_localctx);
         enterOuterAlt(_localctx, 4);
         {
-        setState(331);
+        setState(334);
         match(FALSE);
         }
         break;
@@ -2361,7 +2388,7 @@ class PainlessParser extends Parser {
         _localctx = new NullContext(_localctx);
         enterOuterAlt(_localctx, 5);
         {
-        setState(332);
+        setState(335);
         match(NULL);
         }
         break;
@@ -2369,7 +2396,7 @@ class PainlessParser extends Parser {
         _localctx = new StringContext(_localctx);
         enterOuterAlt(_localctx, 6);
         {
-        setState(333);
+        setState(336);
         match(STRING);
         }
         break;
@@ -2377,7 +2404,7 @@ class PainlessParser extends Parser {
         _localctx = new RegexContext(_localctx);
         enterOuterAlt(_localctx, 7);
         {
-        setState(334);
+        setState(337);
         match(REGEX);
         }
         break;
@@ -2385,7 +2412,7 @@ class PainlessParser extends Parser {
         _localctx = new ListinitContext(_localctx);
         enterOuterAlt(_localctx, 8);
         {
-        setState(335);
+        setState(338);
         listinitializer();
         }
         break;
@@ -2393,7 +2420,7 @@ class PainlessParser extends Parser {
         _localctx = new MapinitContext(_localctx);
         enterOuterAlt(_localctx, 9);
         {
-        setState(336);
+        setState(339);
         mapinitializer();
         }
         break;
@@ -2401,7 +2428,7 @@ class PainlessParser extends Parser {
         _localctx = new VariableContext(_localctx);
         enterOuterAlt(_localctx, 10);
         {
-        setState(337);
+        setState(340);
         match(ID);
         }
         break;
@@ -2409,9 +2436,9 @@ class PainlessParser extends Parser {
         _localctx = new CalllocalContext(_localctx);
         enterOuterAlt(_localctx, 11);
         {
-        setState(338);
+        setState(341);
         match(ID);
-        setState(339);
+        setState(342);
         arguments();
         }
         break;
@@ -2419,11 +2446,11 @@ class PainlessParser extends Parser {
         _localctx = new NewobjectContext(_localctx);
         enterOuterAlt(_localctx, 12);
         {
-        setState(340);
+        setState(343);
         match(NEW);
-        setState(341);
+        setState(344);
         match(TYPE);
-        setState(342);
+        setState(345);
         arguments();
         }
         break;
@@ -2465,26 +2492,26 @@ class PainlessParser extends Parser {
     PostfixContext _localctx = new PostfixContext(_ctx, getState());
     enterRule(_localctx, 36, RULE_postfix);
     try {
-      setState(348);
+      setState(351);
       switch ( getInterpreter().adaptivePredict(_input,25,_ctx) ) {
       case 1:
         enterOuterAlt(_localctx, 1);
         {
-        setState(345);
+        setState(348);
         callinvoke();
         }
         break;
       case 2:
         enterOuterAlt(_localctx, 2);
         {
-        setState(346);
+        setState(349);
         fieldaccess();
         }
         break;
       case 3:
         enterOuterAlt(_localctx, 3);
         {
-        setState(347);
+        setState(350);
         braceaccess();
         }
         break;
@@ -2523,19 +2550,19 @@ class PainlessParser extends Parser {
     PostdotContext _localctx = new PostdotContext(_ctx, getState());
     enterRule(_localctx, 38, RULE_postdot);
     try {
-      setState(352);
+      setState(355);
       switch ( getInterpreter().adaptivePredict(_input,26,_ctx) ) {
       case 1:
         enterOuterAlt(_localctx, 1);
         {
-        setState(350);
+        setState(353);
         callinvoke();
         }
         break;
       case 2:
         enterOuterAlt(_localctx, 2);
         {
-        setState(351);
+        setState(354);
         fieldaccess();
         }
         break;
@@ -2553,12 +2580,12 @@ class PainlessParser extends Parser {
   }
 
   public static class CallinvokeContext extends ParserRuleContext {
-    public TerminalNode DOT() { return getToken(PainlessParser.DOT, 0); }
     public TerminalNode DOTID() { return getToken(PainlessParser.DOTID, 0); }
     public ArgumentsContext arguments() {
       return getRuleContext(ArgumentsContext.class,0);
     }
-    public TerminalNode COND() { return getToken(PainlessParser.COND, 0); }
+    public TerminalNode DOT() { return getToken(PainlessParser.DOT, 0); }
+    public TerminalNode NSDOT() { return getToken(PainlessParser.NSDOT, 0); }
     public CallinvokeContext(ParserRuleContext parent, int invokingState) {
       super(parent, invokingState);
     }
@@ -2577,17 +2604,13 @@ class PainlessParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-      setState(355);
-      _la = _input.LA(1);
-      if (_la==COND) {
-        {
-        setState(354);
-        match(COND);
-        }
-      }
-
       setState(357);
-      match(DOT);
+      _la = _input.LA(1);
+      if ( !(_la==DOT || _la==NSDOT) ) {
+      _errHandler.recoverInline(this);
+      } else {
+        consume();
+      }
       setState(358);
       match(DOTID);
       setState(359);
@@ -2607,9 +2630,9 @@ class PainlessParser extends Parser {
 
   public static class FieldaccessContext extends ParserRuleContext {
     public TerminalNode DOT() { return getToken(PainlessParser.DOT, 0); }
+    public TerminalNode NSDOT() { return getToken(PainlessParser.NSDOT, 0); }
     public TerminalNode DOTID() { return getToken(PainlessParser.DOTID, 0); }
     public TerminalNode DOTINTEGER() { return getToken(PainlessParser.DOTINTEGER, 0); }
-    public TerminalNode COND() { return getToken(PainlessParser.COND, 0); }
     public FieldaccessContext(ParserRuleContext parent, int invokingState) {
       super(parent, invokingState);
     }
@@ -2628,18 +2651,14 @@ class PainlessParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-      setState(362);
+      setState(361);
       _la = _input.LA(1);
-      if (_la==COND) {
-        {
-        setState(361);
-        match(COND);
-        }
+      if ( !(_la==DOT || _la==NSDOT) ) {
+      _errHandler.recoverInline(this);
+      } else {
+        consume();
       }
-
-      setState(364);
-      match(DOT);
-      setState(365);
+      setState(362);
       _la = _input.LA(1);
       if ( !(_la==DOTINTEGER || _la==DOTID) ) {
       _errHandler.recoverInline(this);
@@ -2682,11 +2701,11 @@ class PainlessParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-      setState(367);
+      setState(364);
       match(LBRACE);
-      setState(368);
+      setState(365);
       expression(0);
-      setState(369);
+      setState(366);
       match(RBRACE);
       }
     }
@@ -2783,17 +2802,17 @@ class PainlessParser extends Parser {
     int _la;
     try {
       int _alt;
-      setState(415);
-      switch ( getInterpreter().adaptivePredict(_input,36,_ctx) ) {
+      setState(412);
+      switch ( getInterpreter().adaptivePredict(_input,34,_ctx) ) {
       case 1:
         _localctx = new NewstandardarrayContext(_localctx);
         enterOuterAlt(_localctx, 1);
         {
-        setState(371);
+        setState(368);
         match(NEW);
-        setState(372);
+        setState(369);
         match(TYPE);
-        setState(377); 
+        setState(374); 
         _errHandler.sync(this);
         _alt = 1;
         do {
@@ -2801,11 +2820,11 @@ class PainlessParser extends Parser {
           case 1:
             {
             {
-            setState(373);
+            setState(370);
             match(LBRACE);
-            setState(374);
+            setState(371);
             expression(0);
-            setState(375);
+            setState(372);
             match(RBRACE);
             }
             }
@@ -2813,31 +2832,31 @@ class PainlessParser extends Parser {
           default:
             throw new NoViableAltException(this);
           }
-          setState(379); 
+          setState(376); 
           _errHandler.sync(this);
-          _alt = getInterpreter().adaptivePredict(_input,29,_ctx);
+          _alt = getInterpreter().adaptivePredict(_input,27,_ctx);
         } while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER );
-        setState(388);
-        switch ( getInterpreter().adaptivePredict(_input,31,_ctx) ) {
+        setState(385);
+        switch ( getInterpreter().adaptivePredict(_input,29,_ctx) ) {
         case 1:
           {
-          setState(381);
+          setState(378);
           postdot();
-          setState(385);
+          setState(382);
           _errHandler.sync(this);
-          _alt = getInterpreter().adaptivePredict(_input,30,_ctx);
+          _alt = getInterpreter().adaptivePredict(_input,28,_ctx);
           while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
             if ( _alt==1 ) {
               {
               {
-              setState(382);
+              setState(379);
               postfix();
               }
               } 
             }
-            setState(387);
+            setState(384);
             _errHandler.sync(this);
-            _alt = getInterpreter().adaptivePredict(_input,30,_ctx);
+            _alt = getInterpreter().adaptivePredict(_input,28,_ctx);
           }
           }
           break;
@@ -2848,67 +2867,67 @@ class PainlessParser extends Parser {
         _localctx = new NewinitializedarrayContext(_localctx);
         enterOuterAlt(_localctx, 2);
         {
-        setState(390);
+        setState(387);
         match(NEW);
-        setState(391);
+        setState(388);
         match(TYPE);
-        setState(392);
+        setState(389);
         match(LBRACE);
-        setState(393);
+        setState(390);
         match(RBRACE);
-        setState(394);
+        setState(391);
         match(LBRACK);
-        setState(403);
+        setState(400);
         _la = _input.LA(1);
-        if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << LBRACE) | (1L << LP) | (1L << NEW) | (1L << BOOLNOT) | (1L << BWNOT) | (1L << ADD) | (1L << SUB) | (1L << INCR) | (1L << DECR))) != 0) || ((((_la - 70)) & ~0x3f) == 0 && ((1L << (_la - 70)) & ((1L << (OCTAL - 70)) | (1L << (HEX - 70)) | (1L << (INTEGER - 70)) | (1L << (DECIMAL - 70)) | (1L << (STRING - 70)) | (1L << (REGEX - 70)) | (1L << (TRUE - 70)) | (1L << (FALSE - 70)) | (1L << (NULL - 70)) | (1L << (TYPE - 70)) | (1L << (ID - 70)))) != 0)) {
+        if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << LBRACE) | (1L << LP) | (1L << NEW) | (1L << BOOLNOT) | (1L << BWNOT) | (1L << ADD) | (1L << SUB) | (1L << INCR) | (1L << DECR))) != 0) || ((((_la - 72)) & ~0x3f) == 0 && ((1L << (_la - 72)) & ((1L << (OCTAL - 72)) | (1L << (HEX - 72)) | (1L << (INTEGER - 72)) | (1L << (DECIMAL - 72)) | (1L << (STRING - 72)) | (1L << (REGEX - 72)) | (1L << (TRUE - 72)) | (1L << (FALSE - 72)) | (1L << (NULL - 72)) | (1L << (TYPE - 72)) | (1L << (ID - 72)))) != 0)) {
           {
-          setState(395);
+          setState(392);
           expression(0);
-          setState(400);
+          setState(397);
           _errHandler.sync(this);
           _la = _input.LA(1);
           while (_la==COMMA) {
             {
             {
-            setState(396);
+            setState(393);
             match(COMMA);
-            setState(397);
+            setState(394);
             expression(0);
             }
             }
-            setState(402);
+            setState(399);
             _errHandler.sync(this);
             _la = _input.LA(1);
           }
           }
         }
 
-        setState(406);
+        setState(403);
         _la = _input.LA(1);
         if (_la==SEMICOLON) {
           {
-          setState(405);
+          setState(402);
           match(SEMICOLON);
           }
         }
 
-        setState(408);
+        setState(405);
         match(RBRACK);
-        setState(412);
+        setState(409);
         _errHandler.sync(this);
-        _alt = getInterpreter().adaptivePredict(_input,35,_ctx);
+        _alt = getInterpreter().adaptivePredict(_input,33,_ctx);
         while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
           if ( _alt==1 ) {
             {
             {
-            setState(409);
+            setState(406);
             postfix();
             }
             } 
           }
-          setState(414);
+          setState(411);
           _errHandler.sync(this);
-          _alt = getInterpreter().adaptivePredict(_input,35,_ctx);
+          _alt = getInterpreter().adaptivePredict(_input,33,_ctx);
         }
         }
         break;
@@ -2954,41 +2973,41 @@ class PainlessParser extends Parser {
     enterRule(_localctx, 48, RULE_listinitializer);
     int _la;
     try {
-      setState(430);
-      switch ( getInterpreter().adaptivePredict(_input,38,_ctx) ) {
+      setState(427);
+      switch ( getInterpreter().adaptivePredict(_input,36,_ctx) ) {
       case 1:
         enterOuterAlt(_localctx, 1);
         {
-        setState(417);
+        setState(414);
         match(LBRACE);
-        setState(418);
+        setState(415);
         expression(0);
-        setState(423);
+        setState(420);
         _errHandler.sync(this);
         _la = _input.LA(1);
         while (_la==COMMA) {
           {
           {
-          setState(419);
+          setState(416);
           match(COMMA);
-          setState(420);
+          setState(417);
           expression(0);
           }
           }
-          setState(425);
+          setState(422);
           _errHandler.sync(this);
           _la = _input.LA(1);
         }
-        setState(426);
+        setState(423);
         match(RBRACE);
         }
         break;
       case 2:
         enterOuterAlt(_localctx, 2);
         {
-        setState(428);
+        setState(425);
         match(LBRACE);
-        setState(429);
+        setState(426);
         match(RBRACE);
         }
         break;
@@ -3035,43 +3054,43 @@ class PainlessParser extends Parser {
     enterRule(_localctx, 50, RULE_mapinitializer);
     int _la;
     try {
-      setState(446);
-      switch ( getInterpreter().adaptivePredict(_input,40,_ctx) ) {
+      setState(443);
+      switch ( getInterpreter().adaptivePredict(_input,38,_ctx) ) {
       case 1:
         enterOuterAlt(_localctx, 1);
         {
-        setState(432);
+        setState(429);
         match(LBRACE);
-        setState(433);
+        setState(430);
         maptoken();
-        setState(438);
+        setState(435);
         _errHandler.sync(this);
         _la = _input.LA(1);
         while (_la==COMMA) {
           {
           {
-          setState(434);
+          setState(431);
           match(COMMA);
-          setState(435);
+          setState(432);
           maptoken();
           }
           }
-          setState(440);
+          setState(437);
           _errHandler.sync(this);
           _la = _input.LA(1);
         }
-        setState(441);
+        setState(438);
         match(RBRACE);
         }
         break;
       case 2:
         enterOuterAlt(_localctx, 2);
         {
-        setState(443);
+        setState(440);
         match(LBRACE);
-        setState(444);
+        setState(441);
         match(COLON);
-        setState(445);
+        setState(442);
         match(RBRACE);
         }
         break;
@@ -3113,11 +3132,11 @@ class PainlessParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-      setState(448);
+      setState(445);
       expression(0);
-      setState(449);
+      setState(446);
       match(COLON);
-      setState(450);
+      setState(447);
       expression(0);
       }
     }
@@ -3164,34 +3183,34 @@ class PainlessParser extends Parser {
       enterOuterAlt(_localctx, 1);
       {
       {
-      setState(452);
+      setState(449);
       match(LP);
-      setState(461);
+      setState(458);
       _la = _input.LA(1);
-      if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << LBRACE) | (1L << LP) | (1L << NEW) | (1L << THIS) | (1L << BOOLNOT) | (1L << BWNOT) | (1L << ADD) | (1L << SUB) | (1L << INCR) | (1L << DECR))) != 0) || ((((_la - 70)) & ~0x3f) == 0 && ((1L << (_la - 70)) & ((1L << (OCTAL - 70)) | (1L << (HEX - 70)) | (1L << (INTEGER - 70)) | (1L << (DECIMAL - 70)) | (1L << (STRING - 70)) | (1L << (REGEX - 70)) | (1L << (TRUE - 70)) | (1L << (FALSE - 70)) | (1L << (NULL - 70)) | (1L << (TYPE - 70)) | (1L << (ID - 70)))) != 0)) {
+      if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << LBRACE) | (1L << LP) | (1L << NEW) | (1L << THIS) | (1L << BOOLNOT) | (1L << BWNOT) | (1L << ADD) | (1L << SUB) | (1L << INCR) | (1L << DECR))) != 0) || ((((_la - 72)) & ~0x3f) == 0 && ((1L << (_la - 72)) & ((1L << (OCTAL - 72)) | (1L << (HEX - 72)) | (1L << (INTEGER - 72)) | (1L << (DECIMAL - 72)) | (1L << (STRING - 72)) | (1L << (REGEX - 72)) | (1L << (TRUE - 72)) | (1L << (FALSE - 72)) | (1L << (NULL - 72)) | (1L << (TYPE - 72)) | (1L << (ID - 72)))) != 0)) {
         {
-        setState(453);
+        setState(450);
         argument();
-        setState(458);
+        setState(455);
         _errHandler.sync(this);
         _la = _input.LA(1);
         while (_la==COMMA) {
           {
           {
-          setState(454);
+          setState(451);
           match(COMMA);
-          setState(455);
+          setState(452);
           argument();
           }
           }
-          setState(460);
+          setState(457);
           _errHandler.sync(this);
           _la = _input.LA(1);
         }
         }
       }
 
-      setState(463);
+      setState(460);
       match(RP);
       }
       }
@@ -3232,26 +3251,26 @@ class PainlessParser extends Parser {
     ArgumentContext _localctx = new ArgumentContext(_ctx, getState());
     enterRule(_localctx, 56, RULE_argument);
     try {
-      setState(468);
-      switch ( getInterpreter().adaptivePredict(_input,43,_ctx) ) {
+      setState(465);
+      switch ( getInterpreter().adaptivePredict(_input,41,_ctx) ) {
       case 1:
         enterOuterAlt(_localctx, 1);
         {
-        setState(465);
+        setState(462);
         expression(0);
         }
         break;
       case 2:
         enterOuterAlt(_localctx, 2);
         {
-        setState(466);
+        setState(463);
         lambda();
         }
         break;
       case 3:
         enterOuterAlt(_localctx, 3);
         {
-        setState(467);
+        setState(464);
         funcref();
         }
         break;
@@ -3306,58 +3325,58 @@ class PainlessParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-      setState(483);
+      setState(480);
       switch (_input.LA(1)) {
       case TYPE:
       case ID:
         {
-        setState(470);
+        setState(467);
         lamtype();
         }
         break;
       case LP:
         {
-        setState(471);
+        setState(468);
         match(LP);
-        setState(480);
+        setState(477);
         _la = _input.LA(1);
         if (_la==TYPE || _la==ID) {
           {
-          setState(472);
+          setState(469);
           lamtype();
-          setState(477);
+          setState(474);
           _errHandler.sync(this);
           _la = _input.LA(1);
           while (_la==COMMA) {
             {
             {
-            setState(473);
+            setState(470);
             match(COMMA);
-            setState(474);
+            setState(471);
             lamtype();
             }
             }
-            setState(479);
+            setState(476);
             _errHandler.sync(this);
             _la = _input.LA(1);
           }
           }
         }
 
-        setState(482);
+        setState(479);
         match(RP);
         }
         break;
       default:
         throw new NoViableAltException(this);
       }
-      setState(485);
+      setState(482);
       match(ARROW);
-      setState(488);
+      setState(485);
       switch (_input.LA(1)) {
       case LBRACK:
         {
-        setState(486);
+        setState(483);
         block();
         }
         break;
@@ -3382,7 +3401,7 @@ class PainlessParser extends Parser {
       case TYPE:
       case ID:
         {
-        setState(487);
+        setState(484);
         expression(0);
         }
         break;
@@ -3425,16 +3444,16 @@ class PainlessParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-      setState(491);
+      setState(488);
       _la = _input.LA(1);
       if (_la==TYPE) {
         {
-        setState(490);
+        setState(487);
         decltype();
         }
       }
 
-      setState(493);
+      setState(490);
       match(ID);
       }
     }
@@ -3513,17 +3532,17 @@ class PainlessParser extends Parser {
     FuncrefContext _localctx = new FuncrefContext(_ctx, getState());
     enterRule(_localctx, 62, RULE_funcref);
     try {
-      setState(508);
-      switch ( getInterpreter().adaptivePredict(_input,49,_ctx) ) {
+      setState(505);
+      switch ( getInterpreter().adaptivePredict(_input,47,_ctx) ) {
       case 1:
         _localctx = new ClassfuncrefContext(_localctx);
         enterOuterAlt(_localctx, 1);
         {
-        setState(495);
+        setState(492);
         match(TYPE);
-        setState(496);
+        setState(493);
         match(REF);
-        setState(497);
+        setState(494);
         match(ID);
         }
         break;
@@ -3531,11 +3550,11 @@ class PainlessParser extends Parser {
         _localctx = new ConstructorfuncrefContext(_localctx);
         enterOuterAlt(_localctx, 2);
         {
-        setState(498);
+        setState(495);
         decltype();
-        setState(499);
+        setState(496);
         match(REF);
-        setState(500);
+        setState(497);
         match(NEW);
         }
         break;
@@ -3543,11 +3562,11 @@ class PainlessParser extends Parser {
         _localctx = new CapturingfuncrefContext(_localctx);
         enterOuterAlt(_localctx, 3);
         {
-        setState(502);
+        setState(499);
         match(ID);
-        setState(503);
+        setState(500);
         match(REF);
-        setState(504);
+        setState(501);
         match(ID);
         }
         break;
@@ -3555,11 +3574,11 @@ class PainlessParser extends Parser {
         _localctx = new LocalfuncrefContext(_localctx);
         enterOuterAlt(_localctx, 4);
         {
-        setState(505);
+        setState(502);
         match(THIS);
-        setState(506);
+        setState(503);
         match(REF);
-        setState(507);
+        setState(504);
         match(ID);
         }
         break;
@@ -3595,39 +3614,41 @@ class PainlessParser extends Parser {
   private boolean expression_sempred(ExpressionContext _localctx, int predIndex) {
     switch (predIndex) {
     case 1:
-      return precpred(_ctx, 14);
+      return precpred(_ctx, 15);
     case 2:
-      return precpred(_ctx, 13);
+      return precpred(_ctx, 14);
     case 3:
-      return precpred(_ctx, 12);
+      return precpred(_ctx, 13);
     case 4:
-      return precpred(_ctx, 11);
+      return precpred(_ctx, 12);
     case 5:
-      return precpred(_ctx, 10);
+      return precpred(_ctx, 11);
     case 6:
-      return precpred(_ctx, 8);
-    case 7:
-      return precpred(_ctx, 7);
-    case 8:
-      return precpred(_ctx, 6);
-    case 9:
-      return precpred(_ctx, 5);
-    case 10:
-      return precpred(_ctx, 4);
-    case 11:
-      return precpred(_ctx, 3);
-    case 12:
-      return precpred(_ctx, 2);
-    case 13:
-      return precpred(_ctx, 1);
-    case 14:
       return precpred(_ctx, 9);
+    case 7:
+      return precpred(_ctx, 8);
+    case 8:
+      return precpred(_ctx, 7);
+    case 9:
+      return precpred(_ctx, 6);
+    case 10:
+      return precpred(_ctx, 5);
+    case 11:
+      return precpred(_ctx, 4);
+    case 12:
+      return precpred(_ctx, 3);
+    case 13:
+      return precpred(_ctx, 2);
+    case 14:
+      return precpred(_ctx, 1);
+    case 15:
+      return precpred(_ctx, 10);
     }
     return true;
   }
 
   public static final String _serializedATN =
-    "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\3T\u0201\4\2\t\2\4"+
+    "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\3V\u01fe\4\2\t\2\4"+
     "\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t"+
     "\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"+
     "\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31"+
@@ -3647,182 +3668,181 @@ class PainlessParser extends Parser {
     "\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\20"+
     "\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\20"+
     "\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\20"+
-    "\3\20\3\20\3\20\3\20\3\20\3\20\7\20\u0122\n\20\f\20\16\20\u0125\13\20"+
-    "\3\21\3\21\3\21\3\21\3\21\3\21\3\21\3\21\3\21\3\21\3\21\3\21\3\21\5\21"+
-    "\u0134\n\21\3\22\3\22\7\22\u0138\n\22\f\22\16\22\u013b\13\22\3\22\3\22"+
-    "\3\22\7\22\u0140\n\22\f\22\16\22\u0143\13\22\3\22\5\22\u0146\n\22\3\23"+
-    "\3\23\3\23\3\23\3\23\3\23\3\23\3\23\3\23\3\23\3\23\3\23\3\23\3\23\3\23"+
-    "\3\23\3\23\3\23\5\23\u015a\n\23\3\24\3\24\3\24\5\24\u015f\n\24\3\25\3"+
-    "\25\5\25\u0163\n\25\3\26\5\26\u0166\n\26\3\26\3\26\3\26\3\26\3\27\5\27"+
-    "\u016d\n\27\3\27\3\27\3\27\3\30\3\30\3\30\3\30\3\31\3\31\3\31\3\31\3\31"+
-    "\3\31\6\31\u017c\n\31\r\31\16\31\u017d\3\31\3\31\7\31\u0182\n\31\f\31"+
-    "\16\31\u0185\13\31\5\31\u0187\n\31\3\31\3\31\3\31\3\31\3\31\3\31\3\31"+
-    "\3\31\7\31\u0191\n\31\f\31\16\31\u0194\13\31\5\31\u0196\n\31\3\31\5\31"+
-    "\u0199\n\31\3\31\3\31\7\31\u019d\n\31\f\31\16\31\u01a0\13\31\5\31\u01a2"+
-    "\n\31\3\32\3\32\3\32\3\32\7\32\u01a8\n\32\f\32\16\32\u01ab\13\32\3\32"+
-    "\3\32\3\32\3\32\5\32\u01b1\n\32\3\33\3\33\3\33\3\33\7\33\u01b7\n\33\f"+
-    "\33\16\33\u01ba\13\33\3\33\3\33\3\33\3\33\3\33\5\33\u01c1\n\33\3\34\3"+
-    "\34\3\34\3\34\3\35\3\35\3\35\3\35\7\35\u01cb\n\35\f\35\16\35\u01ce\13"+
-    "\35\5\35\u01d0\n\35\3\35\3\35\3\36\3\36\3\36\5\36\u01d7\n\36\3\37\3\37"+
-    "\3\37\3\37\3\37\7\37\u01de\n\37\f\37\16\37\u01e1\13\37\5\37\u01e3\n\37"+
-    "\3\37\5\37\u01e6\n\37\3\37\3\37\3\37\5\37\u01eb\n\37\3 \5 \u01ee\n \3"+
-    " \3 \3!\3!\3!\3!\3!\3!\3!\3!\3!\3!\3!\3!\3!\5!\u01ff\n!\3!\2\3\36\"\2"+
-    "\4\6\b\n\f\16\20\22\24\26\30\32\34\36 \"$&(*,.\60\62\64\668:<>@\2\16\3"+
-    "\3\r\r\3\2\37!\3\2\"#\3\289\3\2$&\3\2\'*\3\2+.\3\2<G\3\2:;\4\2\35\36\""+
-    "#\3\2HK\3\2ST\u023b\2E\3\2\2\2\4P\3\2\2\2\6U\3\2\2\2\b\u00bb\3\2\2\2\n"+
-    "\u00bf\3\2\2\2\f\u00c1\3\2\2\2\16\u00ca\3\2\2\2\20\u00ce\3\2\2\2\22\u00d0"+
-    "\3\2\2\2\24\u00d2\3\2\2\2\26\u00db\3\2\2\2\30\u00e3\3\2\2\2\32\u00e8\3"+
-    "\2\2\2\34\u00ef\3\2\2\2\36\u00f1\3\2\2\2 \u0133\3\2\2\2\"\u0145\3\2\2"+
-    "\2$\u0159\3\2\2\2&\u015e\3\2\2\2(\u0162\3\2\2\2*\u0165\3\2\2\2,\u016c"+
-    "\3\2\2\2.\u0171\3\2\2\2\60\u01a1\3\2\2\2\62\u01b0\3\2\2\2\64\u01c0\3\2"+
-    "\2\2\66\u01c2\3\2\2\28\u01c6\3\2\2\2:\u01d6\3\2\2\2<\u01e5\3\2\2\2>\u01ed"+
-    "\3\2\2\2@\u01fe\3\2\2\2BD\5\4\3\2CB\3\2\2\2DG\3\2\2\2EC\3\2\2\2EF\3\2"+
-    "\2\2FK\3\2\2\2GE\3\2\2\2HJ\5\b\5\2IH\3\2\2\2JM\3\2\2\2KI\3\2\2\2KL\3\2"+
-    "\2\2LN\3\2\2\2MK\3\2\2\2NO\7\2\2\3O\3\3\2\2\2PQ\5\26\f\2QR\7R\2\2RS\5"+
-    "\6\4\2ST\5\f\7\2T\5\3\2\2\2Ua\7\t\2\2VW\5\26\f\2W^\7R\2\2XY\7\f\2\2YZ"+
-    "\5\26\f\2Z[\7R\2\2[]\3\2\2\2\\X\3\2\2\2]`\3\2\2\2^\\\3\2\2\2^_\3\2\2\2"+
-    "_b\3\2\2\2`^\3\2\2\2aV\3\2\2\2ab\3\2\2\2bc\3\2\2\2cd\7\n\2\2d\7\3\2\2"+
-    "\2ef\7\16\2\2fg\7\t\2\2gh\5\36\20\2hi\7\n\2\2im\5\n\6\2jk\7\20\2\2kn\5"+
-    "\n\6\2ln\6\5\2\2mj\3\2\2\2ml\3\2\2\2n\u00bc\3\2\2\2op\7\21\2\2pq\7\t\2"+
-    "\2qr\5\36\20\2ru\7\n\2\2sv\5\n\6\2tv\5\16\b\2us\3\2\2\2ut\3\2\2\2v\u00bc"+
-    "\3\2\2\2wx\7\22\2\2xy\5\f\7\2yz\7\21\2\2z{\7\t\2\2{|\5\36\20\2|}\7\n\2"+
-    "\2}~\5\34\17\2~\u00bc\3\2\2\2\177\u0080\7\23\2\2\u0080\u0082\7\t\2\2\u0081"+
-    "\u0083\5\20\t\2\u0082\u0081\3\2\2\2\u0082\u0083\3\2\2\2\u0083\u0084\3"+
-    "\2\2\2\u0084\u0086\7\r\2\2\u0085\u0087\5\36\20\2\u0086\u0085\3\2\2\2\u0086"+
-    "\u0087\3\2\2\2\u0087\u0088\3\2\2\2\u0088\u008a\7\r\2\2\u0089\u008b\5\22"+
-    "\n\2\u008a\u0089\3\2\2\2\u008a\u008b\3\2\2\2\u008b\u008c\3\2\2\2\u008c"+
-    "\u008f\7\n\2\2\u008d\u0090\5\n\6\2\u008e\u0090\5\16\b\2\u008f\u008d\3"+
-    "\2\2\2\u008f\u008e\3\2\2\2\u0090\u00bc\3\2\2\2\u0091\u0092\7\23\2\2\u0092"+
-    "\u0093\7\t\2\2\u0093\u0094\5\26\f\2\u0094\u0095\7R\2\2\u0095\u0096\7\65"+
-    "\2\2\u0096\u0097\5\36\20\2\u0097\u0098\7\n\2\2\u0098\u0099\5\n\6\2\u0099"+
-    "\u00bc\3\2\2\2\u009a\u009b\7\23\2\2\u009b\u009c\7\t\2\2\u009c\u009d\7"+
-    "R\2\2\u009d\u009e\7\17\2\2\u009e\u009f\5\36\20\2\u009f\u00a0\7\n\2\2\u00a0"+
-    "\u00a1\5\n\6\2\u00a1\u00bc\3\2\2\2\u00a2\u00a3\5\24\13\2\u00a3\u00a4\5"+
-    "\34\17\2\u00a4\u00bc\3\2\2\2\u00a5\u00a6\7\24\2\2\u00a6\u00bc\5\34\17"+
-    "\2\u00a7\u00a8\7\25\2\2\u00a8\u00bc\5\34\17\2\u00a9\u00aa\7\26\2\2\u00aa"+
-    "\u00ab\5\36\20\2\u00ab\u00ac\5\34\17\2\u00ac\u00bc\3\2\2\2\u00ad\u00ae"+
-    "\7\30\2\2\u00ae\u00b0\5\f\7\2\u00af\u00b1\5\32\16\2\u00b0\u00af\3\2\2"+
-    "\2\u00b1\u00b2\3\2\2\2\u00b2\u00b0\3\2\2\2\u00b2\u00b3\3\2\2\2\u00b3\u00bc"+
-    "\3\2\2\2\u00b4\u00b5\7\32\2\2\u00b5\u00b6\5\36\20\2\u00b6\u00b7\5\34\17"+
-    "\2\u00b7\u00bc\3\2\2\2\u00b8\u00b9\5\36\20\2\u00b9\u00ba\5\34\17\2\u00ba"+
-    "\u00bc\3\2\2\2\u00bbe\3\2\2\2\u00bbo\3\2\2\2\u00bbw\3\2\2\2\u00bb\177"+
-    "\3\2\2\2\u00bb\u0091\3\2\2\2\u00bb\u009a\3\2\2\2\u00bb\u00a2\3\2\2\2\u00bb"+
-    "\u00a5\3\2\2\2\u00bb\u00a7\3\2\2\2\u00bb\u00a9\3\2\2\2\u00bb\u00ad\3\2"+
-    "\2\2\u00bb\u00b4\3\2\2\2\u00bb\u00b8\3\2\2\2\u00bc\t\3\2\2\2\u00bd\u00c0"+
-    "\5\f\7\2\u00be\u00c0\5\b\5\2\u00bf\u00bd\3\2\2\2\u00bf\u00be\3\2\2\2\u00c0"+
-    "\13\3\2\2\2\u00c1\u00c5\7\5\2\2\u00c2\u00c4\5\b\5\2\u00c3\u00c2\3\2\2"+
-    "\2\u00c4\u00c7\3\2\2\2\u00c5\u00c3\3\2\2\2\u00c5\u00c6\3\2\2\2\u00c6\u00c8"+
-    "\3\2\2\2\u00c7\u00c5\3\2\2\2\u00c8\u00c9\7\6\2\2\u00c9\r\3\2\2\2\u00ca"+
-    "\u00cb\7\r\2\2\u00cb\17\3\2\2\2\u00cc\u00cf\5\24\13\2\u00cd\u00cf\5\36"+
-    "\20\2\u00ce\u00cc\3\2\2\2\u00ce\u00cd\3\2\2\2\u00cf\21\3\2\2\2\u00d0\u00d1"+
-    "\5\36\20\2\u00d1\23\3\2\2\2\u00d2\u00d3\5\26\f\2\u00d3\u00d8\5\30\r\2"+
-    "\u00d4\u00d5\7\f\2\2\u00d5\u00d7\5\30\r\2\u00d6\u00d4\3\2\2\2\u00d7\u00da"+
-    "\3\2\2\2\u00d8\u00d6\3\2\2\2\u00d8\u00d9\3\2\2\2\u00d9\25\3\2\2\2\u00da"+
-    "\u00d8\3\2\2\2\u00db\u00e0\7Q\2\2\u00dc\u00dd\7\7\2\2\u00dd\u00df\7\b"+
-    "\2\2\u00de\u00dc\3\2\2\2\u00df\u00e2\3\2\2\2\u00e0\u00de\3\2\2\2\u00e0"+
-    "\u00e1\3\2\2\2\u00e1\27\3\2\2\2\u00e2\u00e0\3\2\2\2\u00e3\u00e6\7R\2\2"+
-    "\u00e4\u00e5\7<\2\2\u00e5\u00e7\5\36\20\2\u00e6\u00e4\3\2\2\2\u00e6\u00e7"+
-    "\3\2\2\2\u00e7\31\3\2\2\2\u00e8\u00e9\7\31\2\2\u00e9\u00ea\7\t\2\2\u00ea"+
-    "\u00eb\7Q\2\2\u00eb\u00ec\7R\2\2\u00ec\u00ed\7\n\2\2\u00ed\u00ee\5\f\7"+
-    "\2\u00ee\33\3\2\2\2\u00ef\u00f0\t\2\2\2\u00f0\35\3\2\2\2\u00f1\u00f2\b"+
-    "\20\1\2\u00f2\u00f3\5 \21\2\u00f3\u0123\3\2\2\2\u00f4\u00f5\f\20\2\2\u00f5"+
-    "\u00f6\t\3\2\2\u00f6\u0122\5\36\20\21\u00f7\u00f8\f\17\2\2\u00f8\u00f9"+
-    "\t\4\2\2\u00f9\u0122\5\36\20\20\u00fa\u00fb\f\16\2\2\u00fb\u00fc\t\5\2"+
-    "\2\u00fc\u0122\5\36\20\17\u00fd\u00fe\f\r\2\2\u00fe\u00ff\t\6\2\2\u00ff"+
-    "\u0122\5\36\20\16\u0100\u0101\f\f\2\2\u0101\u0102\t\7\2\2\u0102\u0122"+
-    "\5\36\20\r\u0103\u0104\f\n\2\2\u0104\u0105\t\b\2\2\u0105\u0122\5\36\20"+
-    "\13\u0106\u0107\f\t\2\2\u0107\u0108\7/\2\2\u0108\u0122\5\36\20\n\u0109"+
-    "\u010a\f\b\2\2\u010a\u010b\7\60\2\2\u010b\u0122\5\36\20\t\u010c\u010d"+
-    "\f\7\2\2\u010d\u010e\7\61\2\2\u010e\u0122\5\36\20\b\u010f\u0110\f\6\2"+
-    "\2\u0110\u0111\7\62\2\2\u0111\u0122\5\36\20\7\u0112\u0113\f\5\2\2\u0113"+
-    "\u0114\7\63\2\2\u0114\u0122\5\36\20\6\u0115\u0116\f\4\2\2\u0116\u0117"+
-    "\7\64\2\2\u0117\u0118\5\36\20\2\u0118\u0119\7\65\2\2\u0119\u011a\5\36"+
-    "\20\4\u011a\u0122\3\2\2\2\u011b\u011c\f\3\2\2\u011c\u011d\t\t\2\2\u011d"+
-    "\u0122\5\36\20\3\u011e\u011f\f\13\2\2\u011f\u0120\7\34\2\2\u0120\u0122"+
-    "\5\26\f\2\u0121\u00f4\3\2\2\2\u0121\u00f7\3\2\2\2\u0121\u00fa\3\2\2\2"+
-    "\u0121\u00fd\3\2\2\2\u0121\u0100\3\2\2\2\u0121\u0103\3\2\2\2\u0121\u0106"+
-    "\3\2\2\2\u0121\u0109\3\2\2\2\u0121\u010c\3\2\2\2\u0121\u010f\3\2\2\2\u0121"+
-    "\u0112\3\2\2\2\u0121\u0115\3\2\2\2\u0121\u011b\3\2\2\2\u0121\u011e\3\2"+
-    "\2\2\u0122\u0125\3\2\2\2\u0123\u0121\3\2\2\2\u0123\u0124\3\2\2\2\u0124"+
-    "\37\3\2\2\2\u0125\u0123\3\2\2\2\u0126\u0127\t\n\2\2\u0127\u0134\5\"\22"+
-    "\2\u0128\u0129\5\"\22\2\u0129\u012a\t\n\2\2\u012a\u0134\3\2\2\2\u012b"+
-    "\u0134\5\"\22\2\u012c\u012d\t\13\2\2\u012d\u0134\5 \21\2\u012e\u012f\7"+
-    "\t\2\2\u012f\u0130\5\26\f\2\u0130\u0131\7\n\2\2\u0131\u0132\5 \21\2\u0132"+
-    "\u0134\3\2\2\2\u0133\u0126\3\2\2\2\u0133\u0128\3\2\2\2\u0133\u012b\3\2"+
-    "\2\2\u0133\u012c\3\2\2\2\u0133\u012e\3\2\2\2\u0134!\3\2\2\2\u0135\u0139"+
-    "\5$\23\2\u0136\u0138\5&\24\2\u0137\u0136\3\2\2\2\u0138\u013b\3\2\2\2\u0139"+
-    "\u0137\3\2\2\2\u0139\u013a\3\2\2\2\u013a\u0146\3\2\2\2\u013b\u0139\3\2"+
-    "\2\2\u013c\u013d\5\26\f\2\u013d\u0141\5(\25\2\u013e\u0140\5&\24\2\u013f"+
-    "\u013e\3\2\2\2\u0140\u0143\3\2\2\2\u0141\u013f\3\2\2\2\u0141\u0142\3\2"+
-    "\2\2\u0142\u0146\3\2\2\2\u0143\u0141\3\2\2\2\u0144\u0146\5\60\31\2\u0145"+
-    "\u0135\3\2\2\2\u0145\u013c\3\2\2\2\u0145\u0144\3\2\2\2\u0146#\3\2\2\2"+
-    "\u0147\u0148\7\t\2\2\u0148\u0149\5\36\20\2\u0149\u014a\7\n\2\2\u014a\u015a"+
-    "\3\2\2\2\u014b\u015a\t\f\2\2\u014c\u015a\7N\2\2\u014d\u015a\7O\2\2\u014e"+
-    "\u015a\7P\2\2\u014f\u015a\7L\2\2\u0150\u015a\7M\2\2\u0151\u015a\5\62\32"+
-    "\2\u0152\u015a\5\64\33\2\u0153\u015a\7R\2\2\u0154\u0155\7R\2\2\u0155\u015a"+
-    "\58\35\2\u0156\u0157\7\27\2\2\u0157\u0158\7Q\2\2\u0158\u015a\58\35\2\u0159"+
-    "\u0147\3\2\2\2\u0159\u014b\3\2\2\2\u0159\u014c\3\2\2\2\u0159\u014d\3\2"+
-    "\2\2\u0159\u014e\3\2\2\2\u0159\u014f\3\2\2\2\u0159\u0150\3\2\2\2\u0159"+
-    "\u0151\3\2\2\2\u0159\u0152\3\2\2\2\u0159\u0153\3\2\2\2\u0159\u0154\3\2"+
-    "\2\2\u0159\u0156\3\2\2\2\u015a%\3\2\2\2\u015b\u015f\5*\26\2\u015c\u015f"+
-    "\5,\27\2\u015d\u015f\5.\30\2\u015e\u015b\3\2\2\2\u015e\u015c\3\2\2\2\u015e"+
-    "\u015d\3\2\2\2\u015f\'\3\2\2\2\u0160\u0163\5*\26\2\u0161\u0163\5,\27\2"+
-    "\u0162\u0160\3\2\2\2\u0162\u0161\3\2\2\2\u0163)\3\2\2\2\u0164\u0166\7"+
-    "\64\2\2\u0165\u0164\3\2\2\2\u0165\u0166\3\2\2\2\u0166\u0167\3\2\2\2\u0167"+
-    "\u0168\7\13\2\2\u0168\u0169\7T\2\2\u0169\u016a\58\35\2\u016a+\3\2\2\2"+
-    "\u016b\u016d\7\64\2\2\u016c\u016b\3\2\2\2\u016c\u016d\3\2\2\2\u016d\u016e"+
-    "\3\2\2\2\u016e\u016f\7\13\2\2\u016f\u0170\t\r\2\2\u0170-\3\2\2\2\u0171"+
-    "\u0172\7\7\2\2\u0172\u0173\5\36\20\2\u0173\u0174\7\b\2\2\u0174/\3\2\2"+
-    "\2\u0175\u0176\7\27\2\2\u0176\u017b\7Q\2\2\u0177\u0178\7\7\2\2\u0178\u0179"+
-    "\5\36\20\2\u0179\u017a\7\b\2\2\u017a\u017c\3\2\2\2\u017b\u0177\3\2\2\2"+
-    "\u017c\u017d\3\2\2\2\u017d\u017b\3\2\2\2\u017d\u017e\3\2\2\2\u017e\u0186"+
-    "\3\2\2\2\u017f\u0183\5(\25\2\u0180\u0182\5&\24\2\u0181\u0180\3\2\2\2\u0182"+
-    "\u0185\3\2\2\2\u0183\u0181\3\2\2\2\u0183\u0184\3\2\2\2\u0184\u0187\3\2"+
-    "\2\2\u0185\u0183\3\2\2\2\u0186\u017f\3\2\2\2\u0186\u0187\3\2\2\2\u0187"+
-    "\u01a2\3\2\2\2\u0188\u0189\7\27\2\2\u0189\u018a\7Q\2\2\u018a\u018b\7\7"+
-    "\2\2\u018b\u018c\7\b\2\2\u018c\u0195\7\5\2\2\u018d\u0192\5\36\20\2\u018e"+
-    "\u018f\7\f\2\2\u018f\u0191\5\36\20\2\u0190\u018e\3\2\2\2\u0191\u0194\3"+
-    "\2\2\2\u0192\u0190\3\2\2\2\u0192\u0193\3\2\2\2\u0193\u0196\3\2\2\2\u0194"+
-    "\u0192\3\2\2\2\u0195\u018d\3\2\2\2\u0195\u0196\3\2\2\2\u0196\u0198\3\2"+
-    "\2\2\u0197\u0199\7\r\2\2\u0198\u0197\3\2\2\2\u0198\u0199\3\2\2\2\u0199"+
-    "\u019a\3\2\2\2\u019a\u019e\7\6\2\2\u019b\u019d\5&\24\2\u019c\u019b\3\2"+
-    "\2\2\u019d\u01a0\3\2\2\2\u019e\u019c\3\2\2\2\u019e\u019f\3\2\2\2\u019f"+
-    "\u01a2\3\2\2\2\u01a0\u019e\3\2\2\2\u01a1\u0175\3\2\2\2\u01a1\u0188\3\2"+
-    "\2\2\u01a2\61\3\2\2\2\u01a3\u01a4\7\7\2\2\u01a4\u01a9\5\36\20\2\u01a5"+
-    "\u01a6\7\f\2\2\u01a6\u01a8\5\36\20\2\u01a7\u01a5\3\2\2\2\u01a8\u01ab\3"+
-    "\2\2\2\u01a9\u01a7\3\2\2\2\u01a9\u01aa\3\2\2\2\u01aa\u01ac\3\2\2\2\u01ab"+
-    "\u01a9\3\2\2\2\u01ac\u01ad\7\b\2\2\u01ad\u01b1\3\2\2\2\u01ae\u01af\7\7"+
-    "\2\2\u01af\u01b1\7\b\2\2\u01b0\u01a3\3\2\2\2\u01b0\u01ae\3\2\2\2\u01b1"+
-    "\63\3\2\2\2\u01b2\u01b3\7\7\2\2\u01b3\u01b8\5\66\34\2\u01b4\u01b5\7\f"+
-    "\2\2\u01b5\u01b7\5\66\34\2\u01b6\u01b4\3\2\2\2\u01b7\u01ba\3\2\2\2\u01b8"+
-    "\u01b6\3\2\2\2\u01b8\u01b9\3\2\2\2\u01b9\u01bb\3\2\2\2\u01ba\u01b8\3\2"+
-    "\2\2\u01bb\u01bc\7\b\2\2\u01bc\u01c1\3\2\2\2\u01bd\u01be\7\7\2\2\u01be"+
-    "\u01bf\7\65\2\2\u01bf\u01c1\7\b\2\2\u01c0\u01b2\3\2\2\2\u01c0\u01bd\3"+
-    "\2\2\2\u01c1\65\3\2\2\2\u01c2\u01c3\5\36\20\2\u01c3\u01c4\7\65\2\2\u01c4"+
-    "\u01c5\5\36\20\2\u01c5\67\3\2\2\2\u01c6\u01cf\7\t\2\2\u01c7\u01cc\5:\36"+
-    "\2\u01c8\u01c9\7\f\2\2\u01c9\u01cb\5:\36\2\u01ca\u01c8\3\2\2\2\u01cb\u01ce"+
-    "\3\2\2\2\u01cc\u01ca\3\2\2\2\u01cc\u01cd\3\2\2\2\u01cd\u01d0\3\2\2\2\u01ce"+
-    "\u01cc\3\2\2\2\u01cf\u01c7\3\2\2\2\u01cf\u01d0\3\2\2\2\u01d0\u01d1\3\2"+
-    "\2\2\u01d1\u01d2\7\n\2\2\u01d29\3\2\2\2\u01d3\u01d7\5\36\20\2\u01d4\u01d7"+
-    "\5<\37\2\u01d5\u01d7\5@!\2\u01d6\u01d3\3\2\2\2\u01d6\u01d4\3\2\2\2\u01d6"+
-    "\u01d5\3\2\2\2\u01d7;\3\2\2\2\u01d8\u01e6\5> \2\u01d9\u01e2\7\t\2\2\u01da"+
-    "\u01df\5> \2\u01db\u01dc\7\f\2\2\u01dc\u01de\5> \2\u01dd\u01db\3\2\2\2"+
-    "\u01de\u01e1\3\2\2\2\u01df\u01dd\3\2\2\2\u01df\u01e0\3\2\2\2\u01e0\u01e3"+
-    "\3\2\2\2\u01e1\u01df\3\2\2\2\u01e2\u01da\3\2\2\2\u01e2\u01e3\3\2\2\2\u01e3"+
-    "\u01e4\3\2\2\2\u01e4\u01e6\7\n\2\2\u01e5\u01d8\3\2\2\2\u01e5\u01d9\3\2"+
-    "\2\2\u01e6\u01e7\3\2\2\2\u01e7\u01ea\7\67\2\2\u01e8\u01eb\5\f\7\2\u01e9"+
-    "\u01eb\5\36\20\2\u01ea\u01e8\3\2\2\2\u01ea\u01e9\3\2\2\2\u01eb=\3\2\2"+
-    "\2\u01ec\u01ee\5\26\f\2\u01ed\u01ec\3\2\2\2\u01ed\u01ee\3\2\2\2\u01ee"+
-    "\u01ef\3\2\2\2\u01ef\u01f0\7R\2\2\u01f0?\3\2\2\2\u01f1\u01f2\7Q\2\2\u01f2"+
-    "\u01f3\7\66\2\2\u01f3\u01ff\7R\2\2\u01f4\u01f5\5\26\f\2\u01f5\u01f6\7"+
-    "\66\2\2\u01f6\u01f7\7\27\2\2\u01f7\u01ff\3\2\2\2\u01f8\u01f9\7R\2\2\u01f9"+
-    "\u01fa\7\66\2\2\u01fa\u01ff\7R\2\2\u01fb\u01fc\7\33\2\2\u01fc\u01fd\7"+
-    "\66\2\2\u01fd\u01ff\7R\2\2\u01fe\u01f1\3\2\2\2\u01fe\u01f4\3\2\2\2\u01fe"+
-    "\u01f8\3\2\2\2\u01fe\u01fb\3\2\2\2\u01ffA\3\2\2\2\64EK^amu\u0082\u0086"+
-    "\u008a\u008f\u00b2\u00bb\u00bf\u00c5\u00ce\u00d8\u00e0\u00e6\u0121\u0123"+
-    "\u0133\u0139\u0141\u0145\u0159\u015e\u0162\u0165\u016c\u017d\u0183\u0186"+
-    "\u0192\u0195\u0198\u019e\u01a1\u01a9\u01b0\u01b8\u01c0\u01cc\u01cf\u01d6"+
-    "\u01df\u01e2\u01e5\u01ea\u01ed\u01fe";
+    "\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\20\7\20\u0125\n\20\f\20\16"+
+    "\20\u0128\13\20\3\21\3\21\3\21\3\21\3\21\3\21\3\21\3\21\3\21\3\21\3\21"+
+    "\3\21\3\21\5\21\u0137\n\21\3\22\3\22\7\22\u013b\n\22\f\22\16\22\u013e"+
+    "\13\22\3\22\3\22\3\22\7\22\u0143\n\22\f\22\16\22\u0146\13\22\3\22\5\22"+
+    "\u0149\n\22\3\23\3\23\3\23\3\23\3\23\3\23\3\23\3\23\3\23\3\23\3\23\3\23"+
+    "\3\23\3\23\3\23\3\23\3\23\3\23\5\23\u015d\n\23\3\24\3\24\3\24\5\24\u0162"+
+    "\n\24\3\25\3\25\5\25\u0166\n\25\3\26\3\26\3\26\3\26\3\27\3\27\3\27\3\30"+
+    "\3\30\3\30\3\30\3\31\3\31\3\31\3\31\3\31\3\31\6\31\u0179\n\31\r\31\16"+
+    "\31\u017a\3\31\3\31\7\31\u017f\n\31\f\31\16\31\u0182\13\31\5\31\u0184"+
+    "\n\31\3\31\3\31\3\31\3\31\3\31\3\31\3\31\3\31\7\31\u018e\n\31\f\31\16"+
+    "\31\u0191\13\31\5\31\u0193\n\31\3\31\5\31\u0196\n\31\3\31\3\31\7\31\u019a"+
+    "\n\31\f\31\16\31\u019d\13\31\5\31\u019f\n\31\3\32\3\32\3\32\3\32\7\32"+
+    "\u01a5\n\32\f\32\16\32\u01a8\13\32\3\32\3\32\3\32\3\32\5\32\u01ae\n\32"+
+    "\3\33\3\33\3\33\3\33\7\33\u01b4\n\33\f\33\16\33\u01b7\13\33\3\33\3\33"+
+    "\3\33\3\33\3\33\5\33\u01be\n\33\3\34\3\34\3\34\3\34\3\35\3\35\3\35\3\35"+
+    "\7\35\u01c8\n\35\f\35\16\35\u01cb\13\35\5\35\u01cd\n\35\3\35\3\35\3\36"+
+    "\3\36\3\36\5\36\u01d4\n\36\3\37\3\37\3\37\3\37\3\37\7\37\u01db\n\37\f"+
+    "\37\16\37\u01de\13\37\5\37\u01e0\n\37\3\37\5\37\u01e3\n\37\3\37\3\37\3"+
+    "\37\5\37\u01e8\n\37\3 \5 \u01eb\n \3 \3 \3!\3!\3!\3!\3!\3!\3!\3!\3!\3"+
+    "!\3!\3!\3!\5!\u01fc\n!\3!\2\3\36\"\2\4\6\b\n\f\16\20\22\24\26\30\32\34"+
+    "\36 \"$&(*,.\60\62\64\668:<>@\2\17\3\3\16\16\3\2 \"\3\2#$\3\2:;\3\2%\'"+
+    "\3\2(+\3\2,/\3\2>I\3\2<=\4\2\36\37#$\3\2JM\3\2\13\f\3\2UV\u0237\2E\3\2"+
+    "\2\2\4P\3\2\2\2\6U\3\2\2\2\b\u00bb\3\2\2\2\n\u00bf\3\2\2\2\f\u00c1\3\2"+
+    "\2\2\16\u00ca\3\2\2\2\20\u00ce\3\2\2\2\22\u00d0\3\2\2\2\24\u00d2\3\2\2"+
+    "\2\26\u00db\3\2\2\2\30\u00e3\3\2\2\2\32\u00e8\3\2\2\2\34\u00ef\3\2\2\2"+
+    "\36\u00f1\3\2\2\2 \u0136\3\2\2\2\"\u0148\3\2\2\2$\u015c\3\2\2\2&\u0161"+
+    "\3\2\2\2(\u0165\3\2\2\2*\u0167\3\2\2\2,\u016b\3\2\2\2.\u016e\3\2\2\2\60"+
+    "\u019e\3\2\2\2\62\u01ad\3\2\2\2\64\u01bd\3\2\2\2\66\u01bf\3\2\2\28\u01c3"+
+    "\3\2\2\2:\u01d3\3\2\2\2<\u01e2\3\2\2\2>\u01ea\3\2\2\2@\u01fb\3\2\2\2B"+
+    "D\5\4\3\2CB\3\2\2\2DG\3\2\2\2EC\3\2\2\2EF\3\2\2\2FK\3\2\2\2GE\3\2\2\2"+
+    "HJ\5\b\5\2IH\3\2\2\2JM\3\2\2\2KI\3\2\2\2KL\3\2\2\2LN\3\2\2\2MK\3\2\2\2"+
+    "NO\7\2\2\3O\3\3\2\2\2PQ\5\26\f\2QR\7T\2\2RS\5\6\4\2ST\5\f\7\2T\5\3\2\2"+
+    "\2Ua\7\t\2\2VW\5\26\f\2W^\7T\2\2XY\7\r\2\2YZ\5\26\f\2Z[\7T\2\2[]\3\2\2"+
+    "\2\\X\3\2\2\2]`\3\2\2\2^\\\3\2\2\2^_\3\2\2\2_b\3\2\2\2`^\3\2\2\2aV\3\2"+
+    "\2\2ab\3\2\2\2bc\3\2\2\2cd\7\n\2\2d\7\3\2\2\2ef\7\17\2\2fg\7\t\2\2gh\5"+
+    "\36\20\2hi\7\n\2\2im\5\n\6\2jk\7\21\2\2kn\5\n\6\2ln\6\5\2\2mj\3\2\2\2"+
+    "ml\3\2\2\2n\u00bc\3\2\2\2op\7\22\2\2pq\7\t\2\2qr\5\36\20\2ru\7\n\2\2s"+
+    "v\5\n\6\2tv\5\16\b\2us\3\2\2\2ut\3\2\2\2v\u00bc\3\2\2\2wx\7\23\2\2xy\5"+
+    "\f\7\2yz\7\22\2\2z{\7\t\2\2{|\5\36\20\2|}\7\n\2\2}~\5\34\17\2~\u00bc\3"+
+    "\2\2\2\177\u0080\7\24\2\2\u0080\u0082\7\t\2\2\u0081\u0083\5\20\t\2\u0082"+
+    "\u0081\3\2\2\2\u0082\u0083\3\2\2\2\u0083\u0084\3\2\2\2\u0084\u0086\7\16"+
+    "\2\2\u0085\u0087\5\36\20\2\u0086\u0085\3\2\2\2\u0086\u0087\3\2\2\2\u0087"+
+    "\u0088\3\2\2\2\u0088\u008a\7\16\2\2\u0089\u008b\5\22\n\2\u008a\u0089\3"+
+    "\2\2\2\u008a\u008b\3\2\2\2\u008b\u008c\3\2\2\2\u008c\u008f\7\n\2\2\u008d"+
+    "\u0090\5\n\6\2\u008e\u0090\5\16\b\2\u008f\u008d\3\2\2\2\u008f\u008e\3"+
+    "\2\2\2\u0090\u00bc\3\2\2\2\u0091\u0092\7\24\2\2\u0092\u0093\7\t\2\2\u0093"+
+    "\u0094\5\26\f\2\u0094\u0095\7T\2\2\u0095\u0096\7\66\2\2\u0096\u0097\5"+
+    "\36\20\2\u0097\u0098\7\n\2\2\u0098\u0099\5\n\6\2\u0099\u00bc\3\2\2\2\u009a"+
+    "\u009b\7\24\2\2\u009b\u009c\7\t\2\2\u009c\u009d\7T\2\2\u009d\u009e\7\20"+
+    "\2\2\u009e\u009f\5\36\20\2\u009f\u00a0\7\n\2\2\u00a0\u00a1\5\n\6\2\u00a1"+
+    "\u00bc\3\2\2\2\u00a2\u00a3\5\24\13\2\u00a3\u00a4\5\34\17\2\u00a4\u00bc"+
+    "\3\2\2\2\u00a5\u00a6\7\25\2\2\u00a6\u00bc\5\34\17\2\u00a7\u00a8\7\26\2"+
+    "\2\u00a8\u00bc\5\34\17\2\u00a9\u00aa\7\27\2\2\u00aa\u00ab\5\36\20\2\u00ab"+
+    "\u00ac\5\34\17\2\u00ac\u00bc\3\2\2\2\u00ad\u00ae\7\31\2\2\u00ae\u00b0"+
+    "\5\f\7\2\u00af\u00b1\5\32\16\2\u00b0\u00af\3\2\2\2\u00b1\u00b2\3\2\2\2"+
+    "\u00b2\u00b0\3\2\2\2\u00b2\u00b3\3\2\2\2\u00b3\u00bc\3\2\2\2\u00b4\u00b5"+
+    "\7\33\2\2\u00b5\u00b6\5\36\20\2\u00b6\u00b7\5\34\17\2\u00b7\u00bc\3\2"+
+    "\2\2\u00b8\u00b9\5\36\20\2\u00b9\u00ba\5\34\17\2\u00ba\u00bc\3\2\2\2\u00bb"+
+    "e\3\2\2\2\u00bbo\3\2\2\2\u00bbw\3\2\2\2\u00bb\177\3\2\2\2\u00bb\u0091"+
+    "\3\2\2\2\u00bb\u009a\3\2\2\2\u00bb\u00a2\3\2\2\2\u00bb\u00a5\3\2\2\2\u00bb"+
+    "\u00a7\3\2\2\2\u00bb\u00a9\3\2\2\2\u00bb\u00ad\3\2\2\2\u00bb\u00b4\3\2"+
+    "\2\2\u00bb\u00b8\3\2\2\2\u00bc\t\3\2\2\2\u00bd\u00c0\5\f\7\2\u00be\u00c0"+
+    "\5\b\5\2\u00bf\u00bd\3\2\2\2\u00bf\u00be\3\2\2\2\u00c0\13\3\2\2\2\u00c1"+
+    "\u00c5\7\5\2\2\u00c2\u00c4\5\b\5\2\u00c3\u00c2\3\2\2\2\u00c4\u00c7\3\2"+
+    "\2\2\u00c5\u00c3\3\2\2\2\u00c5\u00c6\3\2\2\2\u00c6\u00c8\3\2\2\2\u00c7"+
+    "\u00c5\3\2\2\2\u00c8\u00c9\7\6\2\2\u00c9\r\3\2\2\2\u00ca\u00cb\7\16\2"+
+    "\2\u00cb\17\3\2\2\2\u00cc\u00cf\5\24\13\2\u00cd\u00cf\5\36\20\2\u00ce"+
+    "\u00cc\3\2\2\2\u00ce\u00cd\3\2\2\2\u00cf\21\3\2\2\2\u00d0\u00d1\5\36\20"+
+    "\2\u00d1\23\3\2\2\2\u00d2\u00d3\5\26\f\2\u00d3\u00d8\5\30\r\2\u00d4\u00d5"+
+    "\7\r\2\2\u00d5\u00d7\5\30\r\2\u00d6\u00d4\3\2\2\2\u00d7\u00da\3\2\2\2"+
+    "\u00d8\u00d6\3\2\2\2\u00d8\u00d9\3\2\2\2\u00d9\25\3\2\2\2\u00da\u00d8"+
+    "\3\2\2\2\u00db\u00e0\7S\2\2\u00dc\u00dd\7\7\2\2\u00dd\u00df\7\b\2\2\u00de"+
+    "\u00dc\3\2\2\2\u00df\u00e2\3\2\2\2\u00e0\u00de\3\2\2\2\u00e0\u00e1\3\2"+
+    "\2\2\u00e1\27\3\2\2\2\u00e2\u00e0\3\2\2\2\u00e3\u00e6\7T\2\2\u00e4\u00e5"+
+    "\7>\2\2\u00e5\u00e7\5\36\20\2\u00e6\u00e4\3\2\2\2\u00e6\u00e7\3\2\2\2"+
+    "\u00e7\31\3\2\2\2\u00e8\u00e9\7\32\2\2\u00e9\u00ea\7\t\2\2\u00ea\u00eb"+
+    "\7S\2\2\u00eb\u00ec\7T\2\2\u00ec\u00ed\7\n\2\2\u00ed\u00ee\5\f\7\2\u00ee"+
+    "\33\3\2\2\2\u00ef\u00f0\t\2\2\2\u00f0\35\3\2\2\2\u00f1\u00f2\b\20\1\2"+
+    "\u00f2\u00f3\5 \21\2\u00f3\u0126\3\2\2\2\u00f4\u00f5\f\21\2\2\u00f5\u00f6"+
+    "\t\3\2\2\u00f6\u0125\5\36\20\22\u00f7\u00f8\f\20\2\2\u00f8\u00f9\t\4\2"+
+    "\2\u00f9\u0125\5\36\20\21\u00fa\u00fb\f\17\2\2\u00fb\u00fc\t\5\2\2\u00fc"+
+    "\u0125\5\36\20\20\u00fd\u00fe\f\16\2\2\u00fe\u00ff\t\6\2\2\u00ff\u0125"+
+    "\5\36\20\17\u0100\u0101\f\r\2\2\u0101\u0102\t\7\2\2\u0102\u0125\5\36\20"+
+    "\16\u0103\u0104\f\13\2\2\u0104\u0105\t\b\2\2\u0105\u0125\5\36\20\f\u0106"+
+    "\u0107\f\n\2\2\u0107\u0108\7\60\2\2\u0108\u0125\5\36\20\13\u0109\u010a"+
+    "\f\t\2\2\u010a\u010b\7\61\2\2\u010b\u0125\5\36\20\n\u010c\u010d\f\b\2"+
+    "\2\u010d\u010e\7\62\2\2\u010e\u0125\5\36\20\t\u010f\u0110\f\7\2\2\u0110"+
+    "\u0111\7\63\2\2\u0111\u0125\5\36\20\b\u0112\u0113\f\6\2\2\u0113\u0114"+
+    "\7\64\2\2\u0114\u0125\5\36\20\7\u0115\u0116\f\5\2\2\u0116\u0117\7\65\2"+
+    "\2\u0117\u0118\5\36\20\2\u0118\u0119\7\66\2\2\u0119\u011a\5\36\20\5\u011a"+
+    "\u0125\3\2\2\2\u011b\u011c\f\4\2\2\u011c\u011d\7\67\2\2\u011d\u0125\5"+
+    "\36\20\4\u011e\u011f\f\3\2\2\u011f\u0120\t\t\2\2\u0120\u0125\5\36\20\3"+
+    "\u0121\u0122\f\f\2\2\u0122\u0123\7\35\2\2\u0123\u0125\5\26\f\2\u0124\u00f4"+
+    "\3\2\2\2\u0124\u00f7\3\2\2\2\u0124\u00fa\3\2\2\2\u0124\u00fd\3\2\2\2\u0124"+
+    "\u0100\3\2\2\2\u0124\u0103\3\2\2\2\u0124\u0106\3\2\2\2\u0124\u0109\3\2"+
+    "\2\2\u0124\u010c\3\2\2\2\u0124\u010f\3\2\2\2\u0124\u0112\3\2\2\2\u0124"+
+    "\u0115\3\2\2\2\u0124\u011b\3\2\2\2\u0124\u011e\3\2\2\2\u0124\u0121\3\2"+
+    "\2\2\u0125\u0128\3\2\2\2\u0126\u0124\3\2\2\2\u0126\u0127\3\2\2\2\u0127"+
+    "\37\3\2\2\2\u0128\u0126\3\2\2\2\u0129\u012a\t\n\2\2\u012a\u0137\5\"\22"+
+    "\2\u012b\u012c\5\"\22\2\u012c\u012d\t\n\2\2\u012d\u0137\3\2\2\2\u012e"+
+    "\u0137\5\"\22\2\u012f\u0130\t\13\2\2\u0130\u0137\5 \21\2\u0131\u0132\7"+
+    "\t\2\2\u0132\u0133\5\26\f\2\u0133\u0134\7\n\2\2\u0134\u0135\5 \21\2\u0135"+
+    "\u0137\3\2\2\2\u0136\u0129\3\2\2\2\u0136\u012b\3\2\2\2\u0136\u012e\3\2"+
+    "\2\2\u0136\u012f\3\2\2\2\u0136\u0131\3\2\2\2\u0137!\3\2\2\2\u0138\u013c"+
+    "\5$\23\2\u0139\u013b\5&\24\2\u013a\u0139\3\2\2\2\u013b\u013e\3\2\2\2\u013c"+
+    "\u013a\3\2\2\2\u013c\u013d\3\2\2\2\u013d\u0149\3\2\2\2\u013e\u013c\3\2"+
+    "\2\2\u013f\u0140\5\26\f\2\u0140\u0144\5(\25\2\u0141\u0143\5&\24\2\u0142"+
+    "\u0141\3\2\2\2\u0143\u0146\3\2\2\2\u0144\u0142\3\2\2\2\u0144\u0145\3\2"+
+    "\2\2\u0145\u0149\3\2\2\2\u0146\u0144\3\2\2\2\u0147\u0149\5\60\31\2\u0148"+
+    "\u0138\3\2\2\2\u0148\u013f\3\2\2\2\u0148\u0147\3\2\2\2\u0149#\3\2\2\2"+
+    "\u014a\u014b\7\t\2\2\u014b\u014c\5\36\20\2\u014c\u014d\7\n\2\2\u014d\u015d"+
+    "\3\2\2\2\u014e\u015d\t\f\2\2\u014f\u015d\7P\2\2\u0150\u015d\7Q\2\2\u0151"+
+    "\u015d\7R\2\2\u0152\u015d\7N\2\2\u0153\u015d\7O\2\2\u0154\u015d\5\62\32"+
+    "\2\u0155\u015d\5\64\33\2\u0156\u015d\7T\2\2\u0157\u0158\7T\2\2\u0158\u015d"+
+    "\58\35\2\u0159\u015a\7\30\2\2\u015a\u015b\7S\2\2\u015b\u015d\58\35\2\u015c"+
+    "\u014a\3\2\2\2\u015c\u014e\3\2\2\2\u015c\u014f\3\2\2\2\u015c\u0150\3\2"+
+    "\2\2\u015c\u0151\3\2\2\2\u015c\u0152\3\2\2\2\u015c\u0153\3\2\2\2\u015c"+
+    "\u0154\3\2\2\2\u015c\u0155\3\2\2\2\u015c\u0156\3\2\2\2\u015c\u0157\3\2"+
+    "\2\2\u015c\u0159\3\2\2\2\u015d%\3\2\2\2\u015e\u0162\5*\26\2\u015f\u0162"+
+    "\5,\27\2\u0160\u0162\5.\30\2\u0161\u015e\3\2\2\2\u0161\u015f\3\2\2\2\u0161"+
+    "\u0160\3\2\2\2\u0162\'\3\2\2\2\u0163\u0166\5*\26\2\u0164\u0166\5,\27\2"+
+    "\u0165\u0163\3\2\2\2\u0165\u0164\3\2\2\2\u0166)\3\2\2\2\u0167\u0168\t"+
+    "\r\2\2\u0168\u0169\7V\2\2\u0169\u016a\58\35\2\u016a+\3\2\2\2\u016b\u016c"+
+    "\t\r\2\2\u016c\u016d\t\16\2\2\u016d-\3\2\2\2\u016e\u016f\7\7\2\2\u016f"+
+    "\u0170\5\36\20\2\u0170\u0171\7\b\2\2\u0171/\3\2\2\2\u0172\u0173\7\30\2"+
+    "\2\u0173\u0178\7S\2\2\u0174\u0175\7\7\2\2\u0175\u0176\5\36\20\2\u0176"+
+    "\u0177\7\b\2\2\u0177\u0179\3\2\2\2\u0178\u0174\3\2\2\2\u0179\u017a\3\2"+
+    "\2\2\u017a\u0178\3\2\2\2\u017a\u017b\3\2\2\2\u017b\u0183\3\2\2\2\u017c"+
+    "\u0180\5(\25\2\u017d\u017f\5&\24\2\u017e\u017d\3\2\2\2\u017f\u0182\3\2"+
+    "\2\2\u0180\u017e\3\2\2\2\u0180\u0181\3\2\2\2\u0181\u0184\3\2\2\2\u0182"+
+    "\u0180\3\2\2\2\u0183\u017c\3\2\2\2\u0183\u0184\3\2\2\2\u0184\u019f\3\2"+
+    "\2\2\u0185\u0186\7\30\2\2\u0186\u0187\7S\2\2\u0187\u0188\7\7\2\2\u0188"+
+    "\u0189\7\b\2\2\u0189\u0192\7\5\2\2\u018a\u018f\5\36\20\2\u018b\u018c\7"+
+    "\r\2\2\u018c\u018e\5\36\20\2\u018d\u018b\3\2\2\2\u018e\u0191\3\2\2\2\u018f"+
+    "\u018d\3\2\2\2\u018f\u0190\3\2\2\2\u0190\u0193\3\2\2\2\u0191\u018f\3\2"+
+    "\2\2\u0192\u018a\3\2\2\2\u0192\u0193\3\2\2\2\u0193\u0195\3\2\2\2\u0194"+
+    "\u0196\7\16\2\2\u0195\u0194\3\2\2\2\u0195\u0196\3\2\2\2\u0196\u0197\3"+
+    "\2\2\2\u0197\u019b\7\6\2\2\u0198\u019a\5&\24\2\u0199\u0198\3\2\2\2\u019a"+
+    "\u019d\3\2\2\2\u019b\u0199\3\2\2\2\u019b\u019c\3\2\2\2\u019c\u019f\3\2"+
+    "\2\2\u019d\u019b\3\2\2\2\u019e\u0172\3\2\2\2\u019e\u0185\3\2\2\2\u019f"+
+    "\61\3\2\2\2\u01a0\u01a1\7\7\2\2\u01a1\u01a6\5\36\20\2\u01a2\u01a3\7\r"+
+    "\2\2\u01a3\u01a5\5\36\20\2\u01a4\u01a2\3\2\2\2\u01a5\u01a8\3\2\2\2\u01a6"+
+    "\u01a4\3\2\2\2\u01a6\u01a7\3\2\2\2\u01a7\u01a9\3\2\2\2\u01a8\u01a6\3\2"+
+    "\2\2\u01a9\u01aa\7\b\2\2\u01aa\u01ae\3\2\2\2\u01ab\u01ac\7\7\2\2\u01ac"+
+    "\u01ae\7\b\2\2\u01ad\u01a0\3\2\2\2\u01ad\u01ab\3\2\2\2\u01ae\63\3\2\2"+
+    "\2\u01af\u01b0\7\7\2\2\u01b0\u01b5\5\66\34\2\u01b1\u01b2\7\r\2\2\u01b2"+
+    "\u01b4\5\66\34\2\u01b3\u01b1\3\2\2\2\u01b4\u01b7\3\2\2\2\u01b5\u01b3\3"+
+    "\2\2\2\u01b5\u01b6\3\2\2\2\u01b6\u01b8\3\2\2\2\u01b7\u01b5\3\2\2\2\u01b8"+
+    "\u01b9\7\b\2\2\u01b9\u01be\3\2\2\2\u01ba\u01bb\7\7\2\2\u01bb\u01bc\7\66"+
+    "\2\2\u01bc\u01be\7\b\2\2\u01bd\u01af\3\2\2\2\u01bd\u01ba\3\2\2\2\u01be"+
+    "\65\3\2\2\2\u01bf\u01c0\5\36\20\2\u01c0\u01c1\7\66\2\2\u01c1\u01c2\5\36"+
+    "\20\2\u01c2\67\3\2\2\2\u01c3\u01cc\7\t\2\2\u01c4\u01c9\5:\36\2\u01c5\u01c6"+
+    "\7\r\2\2\u01c6\u01c8\5:\36\2\u01c7\u01c5\3\2\2\2\u01c8\u01cb\3\2\2\2\u01c9"+
+    "\u01c7\3\2\2\2\u01c9\u01ca\3\2\2\2\u01ca\u01cd\3\2\2\2\u01cb\u01c9\3\2"+
+    "\2\2\u01cc\u01c4\3\2\2\2\u01cc\u01cd\3\2\2\2\u01cd\u01ce\3\2\2\2\u01ce"+
+    "\u01cf\7\n\2\2\u01cf9\3\2\2\2\u01d0\u01d4\5\36\20\2\u01d1\u01d4\5<\37"+
+    "\2\u01d2\u01d4\5@!\2\u01d3\u01d0\3\2\2\2\u01d3\u01d1\3\2\2\2\u01d3\u01d2"+
+    "\3\2\2\2\u01d4;\3\2\2\2\u01d5\u01e3\5> \2\u01d6\u01df\7\t\2\2\u01d7\u01dc"+
+    "\5> \2\u01d8\u01d9\7\r\2\2\u01d9\u01db\5> \2\u01da\u01d8\3\2\2\2\u01db"+
+    "\u01de\3\2\2\2\u01dc\u01da\3\2\2\2\u01dc\u01dd\3\2\2\2\u01dd\u01e0\3\2"+
+    "\2\2\u01de\u01dc\3\2\2\2\u01df\u01d7\3\2\2\2\u01df\u01e0\3\2\2\2\u01e0"+
+    "\u01e1\3\2\2\2\u01e1\u01e3\7\n\2\2\u01e2\u01d5\3\2\2\2\u01e2\u01d6\3\2"+
+    "\2\2\u01e3\u01e4\3\2\2\2\u01e4\u01e7\79\2\2\u01e5\u01e8\5\f\7\2\u01e6"+
+    "\u01e8\5\36\20\2\u01e7\u01e5\3\2\2\2\u01e7\u01e6\3\2\2\2\u01e8=\3\2\2"+
+    "\2\u01e9\u01eb\5\26\f\2\u01ea\u01e9\3\2\2\2\u01ea\u01eb\3\2\2\2\u01eb"+
+    "\u01ec\3\2\2\2\u01ec\u01ed\7T\2\2\u01ed?\3\2\2\2\u01ee\u01ef\7S\2\2\u01ef"+
+    "\u01f0\78\2\2\u01f0\u01fc\7T\2\2\u01f1\u01f2\5\26\f\2\u01f2\u01f3\78\2"+
+    "\2\u01f3\u01f4\7\30\2\2\u01f4\u01fc\3\2\2\2\u01f5\u01f6\7T\2\2\u01f6\u01f7"+
+    "\78\2\2\u01f7\u01fc\7T\2\2\u01f8\u01f9\7\34\2\2\u01f9\u01fa\78\2\2\u01fa"+
+    "\u01fc\7T\2\2\u01fb\u01ee\3\2\2\2\u01fb\u01f1\3\2\2\2\u01fb\u01f5\3\2"+
+    "\2\2\u01fb\u01f8\3\2\2\2\u01fcA\3\2\2\2\62EK^amu\u0082\u0086\u008a\u008f"+
+    "\u00b2\u00bb\u00bf\u00c5\u00ce\u00d8\u00e0\u00e6\u0124\u0126\u0136\u013c"+
+    "\u0144\u0148\u015c\u0161\u0165\u017a\u0180\u0183\u018f\u0192\u0195\u019b"+
+    "\u019e\u01a6\u01ad\u01b5\u01bd\u01c9\u01cc\u01d3\u01dc\u01df\u01e2\u01e7"+
+    "\u01ea\u01fb";
   public static final ATN _ATN =
     new ATNDeserializer().deserialize(_serializedATN.toCharArray());
   static {
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessParserBaseVisitor.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessParserBaseVisitor.java
index d3a87f1a099..8c4741e6725 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessParserBaseVisitor.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessParserBaseVisitor.java
@@ -235,6 +235,13 @@ class PainlessParserBaseVisitor<T> extends AbstractParseTreeVisitor<T> implement
    * {@link #visitChildren} on {@code ctx}.</p>
    */
   @Override public T visitBinary(PainlessParser.BinaryContext ctx) { return visitChildren(ctx); }
+  /**
+   * {@inheritDoc}
+   *
+   * <p>The default implementation returns the result of calling
+   * {@link #visitChildren} on {@code ctx}.</p>
+   */
+  @Override public T visitElvis(PainlessParser.ElvisContext ctx) { return visitChildren(ctx); }
   /**
    * {@inheritDoc}
    *
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessParserVisitor.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessParserVisitor.java
index 0f7fef6185a..47bfd4a1d05 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessParserVisitor.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessParserVisitor.java
@@ -221,6 +221,13 @@ interface PainlessParserVisitor<T> extends ParseTreeVisitor<T> {
    * @return the visitor result
    */
   T visitBinary(PainlessParser.BinaryContext ctx);
+  /**
+   * Visit a parse tree produced by the {@code elvis}
+   * labeled alternative in {@link PainlessParser#expression}.
+   * @param ctx the parse tree
+   * @return the visitor result
+   */
+  T visitElvis(PainlessParser.ElvisContext ctx);
   /**
    * Visit a parse tree produced by the {@code instanceof}
    * labeled alternative in {@link PainlessParser#expression}.
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/Walker.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/Walker.java
index 5659afc75ea..84d58afa62d 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/Walker.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/Walker.java
@@ -58,6 +58,7 @@ import org.elasticsearch.painless.antlr.PainlessParser.DelimiterContext;
 import org.elasticsearch.painless.antlr.PainlessParser.DoContext;
 import org.elasticsearch.painless.antlr.PainlessParser.DynamicContext;
 import org.elasticsearch.painless.antlr.PainlessParser.EachContext;
+import org.elasticsearch.painless.antlr.PainlessParser.ElvisContext;
 import org.elasticsearch.painless.antlr.PainlessParser.EmptyContext;
 import org.elasticsearch.painless.antlr.PainlessParser.ExprContext;
 import org.elasticsearch.painless.antlr.PainlessParser.ExpressionContext;
@@ -117,6 +118,7 @@ import org.elasticsearch.painless.node.ECapturingFunctionRef;
 import org.elasticsearch.painless.node.EComp;
 import org.elasticsearch.painless.node.EConditional;
 import org.elasticsearch.painless.node.EDecimal;
+import org.elasticsearch.painless.node.EElvis;
 import org.elasticsearch.painless.node.EExplicit;
 import org.elasticsearch.painless.node.EFunctionRef;
 import org.elasticsearch.painless.node.EInstanceof;
@@ -616,6 +618,14 @@ public final class Walker extends PainlessParserBaseVisitor<ANode> {
         return new EConditional(location(ctx), condition, left, right);
     }
 
+    @Override
+    public ANode visitElvis(ElvisContext ctx) {
+        AExpression left = (AExpression)visit(ctx.expression(0));
+        AExpression right = (AExpression)visit(ctx.expression(1));
+
+        return new EElvis(location(ctx), left, right);
+    }
+
     @Override
     public ANode visitAssignment(AssignmentContext ctx) {
         AExpression lhs = (AExpression)visit(ctx.expression(0));
@@ -898,7 +908,7 @@ public final class Walker extends PainlessParserBaseVisitor<ANode> {
         String name = ctx.DOTID().getText();
         List<AExpression> arguments = collectArguments(ctx.arguments());
 
-        return new PCallInvoke(location(ctx), prefix, name, ctx.COND() != null, arguments);
+        return new PCallInvoke(location(ctx), prefix, name, ctx.NSDOT() != null, arguments);
     }
 
     @Override
@@ -917,7 +927,7 @@ public final class Walker extends PainlessParserBaseVisitor<ANode> {
             throw location(ctx).createError(new IllegalStateException("Illegal tree structure."));
         }
 
-        return new PField(location(ctx), prefix, ctx.COND() != null, value);
+        return new PField(location(ctx), prefix, ctx.NSDOT() != null, value);
     }
 
     @Override
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ANode.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ANode.java
index da4e00f0183..567ffcef8a3 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ANode.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ANode.java
@@ -24,9 +24,18 @@ import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 
+import static java.lang.Math.max;
+import static java.util.Collections.emptyList;
+
 /**
  * The superclass for all nodes.
  */
@@ -62,7 +71,87 @@ public abstract class ANode {
      */
     abstract void write(MethodWriter writer, Globals globals);
 
+    /**
+     * Create an error with location information pointing to this node.
+     */
     RuntimeException createError(RuntimeException exception) {
         return location.createError(exception);
     }
+
+    /**
+     * Subclasses should implement this with a method like {@link #singleLineToString(Object...)} or
+     * {@link #multilineToString(Collection, Collection)}.
+     */
+    public abstract String toString();
+
+    // Below are utilities for building the toString
+
+    /**
+     * Build {@link #toString()} for a node without inserting line breaks between the sub-nodes.
+     */
+    protected String singleLineToString(Object... subs) {
+        return singleLineToString(Arrays.asList(subs));
+    }
+
+    /**
+     * Build {@link #toString()} for a node without inserting line breaks between the sub-nodes.
+     */
+    protected String singleLineToString(Collection<? extends Object> subs) {
+        return joinWithName(getClass().getSimpleName(), subs, emptyList());
+    }
+
+    /**
+     * Build {@link #toString()} for a node that optionally ends in {@code (Args some arguments here)}. Usually function calls.
+     */
+    protected String singleLineToStringWithOptionalArgs(Collection<? extends ANode> arguments, Object... restOfSubs) {
+        List<Object> subs = new ArrayList<>();
+        Collections.addAll(subs, restOfSubs);
+        if (false == arguments.isEmpty()) {
+            subs.add(joinWithName("Args", arguments, emptyList()));
+        }
+        return singleLineToString(subs);
+    }
+
+    /**
+     * Build {@link #toString()} for a node that should have new lines after some of its sub-nodes.
+     */
+    protected String multilineToString(Collection<? extends Object> sameLine, Collection<? extends Object> ownLine) {
+        return joinWithName(getClass().getSimpleName(), sameLine, ownLine);
+    }
+
+    /**
+     * Zip two (potentially uneven) lists together into for {@link #toString()}.
+     */
+    protected List<String> pairwiseToString(Collection<? extends Object> lefts, Collection<? extends Object> rights) {
+        List<String> pairs = new ArrayList<>(max(lefts.size(), rights.size()));
+        Iterator<? extends Object> left = lefts.iterator();
+        Iterator<? extends Object> right = rights.iterator();
+        while (left.hasNext() || right.hasNext()) {
+            pairs.add(joinWithName("Pair",
+                    Arrays.asList(left.hasNext() ? left.next() : "<uneven>", right.hasNext() ? right.next() : "<uneven>"),
+                    emptyList()));
+        }
+        return pairs;
+    }
+
+    /**
+     * Build a {@link #toString()} for some expressions. Usually best to use {@link #singleLineToString(Object...)} or
+     * {@link #multilineToString(Collection, Collection)} instead because they include the name of the node by default.
+     */
+    protected String joinWithName(String name, Collection<? extends Object> sameLine,
+            Collection<? extends Object> ownLine) {
+        StringBuilder b = new StringBuilder();
+        b.append('(').append(name);
+        for (Object sub : sameLine) {
+            b.append(' ').append(sub);
+        }
+        if (ownLine.size() == 1 && sameLine.isEmpty()) {
+            b.append(' ').append(ownLine.iterator().next());
+        } else {
+            for (Object sub : ownLine) {
+                b.append("\n  ").append(Objects.toString(sub).replace("\n", "\n  "));
+            }
+        }
+        return b.append(')').toString();
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EAssignment.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EAssignment.java
index a018ec4822b..de2e9fc0535 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EAssignment.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EAssignment.java
@@ -31,6 +31,8 @@ import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
 import org.elasticsearch.painless.Operation;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 
@@ -322,4 +324,24 @@ public final class EAssignment extends AExpression {
             lhs.store(writer, globals); // store the lhs's value from the stack in its respective variable/field/array
         }
     }
+
+    @Override
+    public String toString() {
+        List<Object> subs = new ArrayList<>();
+        subs.add(lhs);
+        if (rhs != null) {
+            // Make sure "=" is in the symbol so this is easy to read at a glance
+            subs.add(operation == null ? "=" : operation.symbol + "=");
+            subs.add(rhs);
+            return singleLineToString(subs);
+        }
+        subs.add(operation.symbol);
+        if (pre) {
+            subs.add("pre");
+        }
+        if (post) {
+            subs.add("post");
+        }
+        return singleLineToString(subs);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EBinary.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EBinary.java
index ca2858feb8d..b762a1e114b 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EBinary.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EBinary.java
@@ -681,4 +681,9 @@ public final class EBinary extends AExpression {
             }
         }
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(left, operation.symbol, right);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EBool.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EBool.java
index 706a00c4925..e1ca0b12292 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EBool.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EBool.java
@@ -114,4 +114,9 @@ public final class EBool extends AExpression {
             throw createError(new IllegalStateException("Illegal tree structure."));
         }
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(left, operation.symbol, right);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EBoolean.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EBoolean.java
index 17c72b43a4f..c9e9ba921d7 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EBoolean.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EBoolean.java
@@ -56,4 +56,9 @@ public final class EBoolean extends AExpression {
     void write(MethodWriter adapter, Globals globals) {
         throw createError(new IllegalStateException("Illegal tree structure."));
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(constant);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ECallLocal.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ECallLocal.java
index c50cb3d6eed..4c977fa66e8 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ECallLocal.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ECallLocal.java
@@ -88,4 +88,9 @@ public final class ECallLocal extends AExpression {
 
         writer.invokeStatic(CLASS_TYPE, method.method);
     }
+
+    @Override
+    public String toString() {
+        return singleLineToStringWithOptionalArgs(arguments, name);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ECapturingFunctionRef.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ECapturingFunctionRef.java
index bf85665e4df..d305bf08373 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ECapturingFunctionRef.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ECapturingFunctionRef.java
@@ -136,4 +136,9 @@ public final class ECapturingFunctionRef extends AExpression implements ILambda
     public Type[] getCaptures() {
         return new Type[] { captured.type.type };
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(variable, call);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ECast.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ECast.java
index e575af24127..5c2a1498761 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ECast.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ECast.java
@@ -60,4 +60,9 @@ final class ECast extends AExpression {
         writer.writeDebugInfo(location);
         writer.writeCast(cast);
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(cast.to, child);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EComp.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EComp.java
index 4b4e902774a..e78dd8eb729 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EComp.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EComp.java
@@ -568,4 +568,9 @@ public final class EComp extends AExpression {
             writer.mark(end);
         }
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(left, operation.symbol, right);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EConditional.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EConditional.java
index 54a4aceb734..40f4b27ed15 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EConditional.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EConditional.java
@@ -106,4 +106,9 @@ public final class EConditional extends AExpression {
         right.write(writer, globals);
         writer.mark(end);
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(condition, left, right);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EConstant.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EConstant.java
index 722a339c822..4242496c51a 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EConstant.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EConstant.java
@@ -89,4 +89,13 @@ final class EConstant extends AExpression {
                 throw createError(new IllegalStateException("Illegal tree structure."));
         }
     }
+
+    @Override
+    public String toString() {
+        String c = constant.toString();
+        if (constant instanceof String) {
+            c = "'" + c + "'";
+        }
+        return singleLineToString(constant.getClass().getSimpleName(), c);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EDecimal.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EDecimal.java
index 437b93d2770..85675a02892 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EDecimal.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EDecimal.java
@@ -75,4 +75,9 @@ public final class EDecimal extends AExpression {
     void write(MethodWriter writer, Globals globals) {
         throw createError(new IllegalStateException("Illegal tree structure."));
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(value);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EElvis.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EElvis.java
new file mode 100644
index 00000000000..a711f17c5b0
--- /dev/null
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EElvis.java
@@ -0,0 +1,113 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.painless.node;
+
+import org.elasticsearch.painless.AnalyzerCaster;
+import org.elasticsearch.painless.Definition.Type;
+import org.elasticsearch.painless.Globals;
+import org.elasticsearch.painless.Locals;
+import org.elasticsearch.painless.Location;
+import org.elasticsearch.painless.MethodWriter;
+import org.objectweb.asm.Label;
+
+import java.util.Set;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * The Elvis operator ({@code ?:}), a null coalescing operator. Binary operator that evaluates the first expression and return it if it is
+ * non null. If the first expression is null then it evaluates the second expression and returns it.
+ */
+public class EElvis extends AExpression {
+    private AExpression lhs;
+    private AExpression rhs;
+
+    public EElvis(Location location, AExpression lhs, AExpression rhs) {
+        super(location);
+
+        this.lhs = requireNonNull(lhs);
+        this.rhs = requireNonNull(rhs);
+    }
+
+    @Override
+    void extractVariables(Set<String> variables) {
+        lhs.extractVariables(variables);
+        rhs.extractVariables(variables);
+    }
+
+    @Override
+    void analyze(Locals locals) {
+        if (expected != null && expected.sort.primitive) {
+            throw createError(new IllegalArgumentException("Evlis operator cannot return primitives"));
+        }
+        lhs.expected = expected;
+        lhs.explicit = explicit;
+        lhs.internal = internal;
+        rhs.expected = expected;
+        rhs.explicit = explicit;
+        rhs.internal = internal;
+        actual = expected;
+        lhs.analyze(locals);
+        rhs.analyze(locals);
+
+        if (lhs.isNull) {
+            throw createError(new IllegalArgumentException("Extraneous elvis operator. LHS is null."));
+        }
+        if (lhs.constant != null) {
+            throw createError(new IllegalArgumentException("Extraneous elvis operator. LHS is a constant."));
+        }
+        if (lhs.actual.sort.primitive) {
+            throw createError(new IllegalArgumentException("Extraneous elvis operator. LHS is a primitive."));
+        }
+        if (rhs.isNull) {
+            throw createError(new IllegalArgumentException("Extraneous elvis operator. RHS is null."));
+        }
+
+        if (expected == null) {
+            final Type promote = AnalyzerCaster.promoteConditional(lhs.actual, rhs.actual, lhs.constant, rhs.constant);
+
+            lhs.expected = promote;
+            rhs.expected = promote;
+            actual = promote;
+        }
+
+        lhs = lhs.cast(locals);
+        rhs = rhs.cast(locals);
+    }
+
+    @Override
+    void write(MethodWriter writer, Globals globals) {
+        writer.writeDebugInfo(location);
+
+        Label end = new Label();
+
+        lhs.write(writer, globals);
+        writer.dup();
+        writer.ifNonNull(end);
+        writer.pop();
+        rhs.write(writer, globals);
+        writer.mark(end);
+    }
+
+    @Override
+    public String toString() {
+        return singleLineToString(lhs, rhs);
+    }
+}
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EExplicit.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EExplicit.java
index 527bcc9a0bb..f5e6f6f96b2 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EExplicit.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EExplicit.java
@@ -74,4 +74,9 @@ public final class EExplicit extends AExpression {
 
         return child.cast(locals);
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(type, child);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EFunctionRef.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EFunctionRef.java
index 17ab7c014fa..48230646b01 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EFunctionRef.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EFunctionRef.java
@@ -130,4 +130,9 @@ public final class EFunctionRef extends AExpression implements ILambda {
     public Type[] getCaptures() {
         return new Type[0]; // no captures
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(type, call);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EInstanceof.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EInstanceof.java
index ba8a3454ee2..9bdeea93fde 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EInstanceof.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EInstanceof.java
@@ -30,7 +30,7 @@ import java.util.Objects;
 import java.util.Set;
 
 /**
- * Represents instanceof operator.
+ * Represents {@code instanceof} operator.
  * <p>
  * Unlike java's, this works for primitive types too.
  */
@@ -96,4 +96,9 @@ public final class EInstanceof extends AExpression {
             writer.instanceOf(org.objectweb.asm.Type.getType(resolvedType));
         }
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(expression, type);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ELambda.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ELambda.java
index 802da80860d..4960c6520c0 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ELambda.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ELambda.java
@@ -19,16 +19,16 @@
 
 package org.elasticsearch.painless.node;
 
+import org.elasticsearch.painless.Definition;
+import org.elasticsearch.painless.Definition.Method;
 import org.elasticsearch.painless.Definition.Type;
+import org.elasticsearch.painless.FunctionRef;
+import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Locals.Variable;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
-import org.elasticsearch.painless.Definition.Method;
 import org.elasticsearch.painless.node.SFunction.FunctionReserved;
-import org.elasticsearch.painless.Definition;
-import org.elasticsearch.painless.FunctionRef;
-import org.elasticsearch.painless.Globals;
 import org.objectweb.asm.Opcodes;
 
 import java.lang.invoke.LambdaMetafactory;
@@ -245,4 +245,9 @@ public final class ELambda extends AExpression implements ILambda {
         }
         return types;
     }
+
+    @Override
+    public String toString() {
+        return multilineToString(pairwiseToString(paramTypeStrs, paramNameStrs), statements);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EListInit.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EListInit.java
index dd93ec0ee72..eb6ff14fb8b 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EListInit.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EListInit.java
@@ -101,4 +101,9 @@ public final class EListInit extends AExpression {
             writer.pop();
         }
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(values);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EMapInit.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EMapInit.java
index 0dcba39d457..1e437d0a71c 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EMapInit.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EMapInit.java
@@ -124,4 +124,9 @@ public final class EMapInit extends AExpression {
             writer.pop();
         }
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(pairwiseToString(keys, values));
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENewArray.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENewArray.java
index 3334b05e74e..f19bff33e5d 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENewArray.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENewArray.java
@@ -20,10 +20,10 @@
 package org.elasticsearch.painless.node;
 
 import org.elasticsearch.painless.Definition;
-import org.elasticsearch.painless.Globals;
-import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.Definition.Type;
+import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
+import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
 
 import java.util.List;
@@ -108,4 +108,9 @@ public final class ENewArray extends AExpression {
             }
         }
     }
+
+    @Override
+    public String toString() {
+        return singleLineToStringWithOptionalArgs(arguments, type, initialize ? "init" : "dims");
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENewObj.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENewObj.java
index 7a19491fd09..7f2458a8dc1 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENewObj.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENewObj.java
@@ -20,12 +20,12 @@
 package org.elasticsearch.painless.node;
 
 import org.elasticsearch.painless.Definition;
-import org.elasticsearch.painless.Globals;
-import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.Definition.Method;
 import org.elasticsearch.painless.Definition.Struct;
 import org.elasticsearch.painless.Definition.Type;
+import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
+import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
 
 import java.util.List;
@@ -110,4 +110,9 @@ public final class ENewObj extends AExpression {
 
         writer.invokeConstructor(constructor.owner.type, constructor.method);
     }
+
+    @Override
+    public String toString() {
+        return singleLineToStringWithOptionalArgs(arguments, type);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENull.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENull.java
index b07344e86b1..0ab574b2e07 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENull.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENull.java
@@ -66,4 +66,9 @@ public final class ENull extends AExpression {
     void write(MethodWriter writer, Globals globals) {
         writer.visitInsn(Opcodes.ACONST_NULL);
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString();
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENumeric.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENumeric.java
index 80436c7b34e..8e14f7f1ea9 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENumeric.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENumeric.java
@@ -31,7 +31,7 @@ import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.MethodWriter;
 
 /**
- * Respresents a non-decimal numeric constant.
+ * Represents a non-decimal numeric constant.
  */
 public final class ENumeric extends AExpression {
 
@@ -121,4 +121,12 @@ public final class ENumeric extends AExpression {
     void write(MethodWriter writer, Globals globals) {
         throw createError(new IllegalStateException("Illegal tree structure."));
     }
+
+    @Override
+    public String toString() {
+        if (radix != 10) {
+            return singleLineToString(value, radix);
+        }
+        return singleLineToString(value);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ERegex.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ERegex.java
index 8b9e1bcdc9c..1d1f41948c4 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ERegex.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ERegex.java
@@ -104,4 +104,23 @@ public final class ERegex extends AExpression {
                 throw new IllegalArgumentException("Unknown flag [" + c + "]");
         }
     }
+
+    @Override
+    public String toString() {
+        StringBuilder f = new StringBuilder();
+        if ((flags & Pattern.CANON_EQ) != 0)                f.append('c');
+        if ((flags & Pattern.CASE_INSENSITIVE) != 0)        f.append('i');
+        if ((flags & Pattern.LITERAL) != 0)                 f.append('l');
+        if ((flags & Pattern.MULTILINE) != 0)               f.append('m');
+        if ((flags & Pattern.DOTALL) != 0)                  f.append('s');
+        if ((flags & Pattern.UNICODE_CHARACTER_CLASS) != 0) f.append('U');
+        if ((flags & Pattern.UNICODE_CASE) != 0)            f.append('u');
+        if ((flags & Pattern.COMMENTS) != 0)                f.append('x');
+
+        String p = "/" + pattern + "/";
+        if (f.length() == 0) {
+            return singleLineToString(p);
+        }
+        return singleLineToString(p, f);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EStatic.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EStatic.java
index 8e6846c4ef9..9db9f6f8cae 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EStatic.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EStatic.java
@@ -60,4 +60,9 @@ public final class EStatic extends AExpression {
     void write(MethodWriter writer, Globals globals) {
         // Do nothing.
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(type);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EString.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EString.java
index 84062ffccac..0c2cec13e24 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EString.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EString.java
@@ -57,4 +57,9 @@ public final class EString extends AExpression {
     void write(MethodWriter writer, Globals globals) {
         throw new IllegalStateException("Illegal tree structure.");
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString("'" + constant.toString() + "'");
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EUnary.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EUnary.java
index 129e6c67f6e..cd483d7d71a 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EUnary.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EUnary.java
@@ -249,4 +249,9 @@ public final class EUnary extends AExpression {
             }
         }
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(operation.symbol, child);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EVariable.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EVariable.java
index 11c29dc7514..40cf194df23 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EVariable.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EVariable.java
@@ -95,4 +95,9 @@ public final class EVariable extends AStoreable {
     void store(MethodWriter writer, Globals globals) {
         writer.visitVarInsn(actual.type.getOpcode(Opcodes.ISTORE), variable.getSlot());
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(name);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PBrace.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PBrace.java
index 9732ab72886..4f04db092d5 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PBrace.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PBrace.java
@@ -117,4 +117,9 @@ public final class PBrace extends AStoreable {
     void store(MethodWriter writer, Globals globals) {
         sub.store(writer, globals);
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(prefix, index);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PCallInvoke.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PCallInvoke.java
index 9d405a7b00a..29369cd9456 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PCallInvoke.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PCallInvoke.java
@@ -106,4 +106,9 @@ public final class PCallInvoke extends AExpression {
         prefix.write(writer, globals);
         sub.write(writer, globals);
     }
+
+    @Override
+    public String toString() {
+        return singleLineToStringWithOptionalArgs(arguments, prefix, name);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PField.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PField.java
index ea23d3cdd07..f22a5d49203 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PField.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PField.java
@@ -66,7 +66,7 @@ public final class PField extends AStoreable {
         Sort sort = prefix.actual.sort;
 
         if (sort == Sort.ARRAY) {
-            sub = new PSubArrayLength(location,prefix.actual.name, value);
+            sub = new PSubArrayLength(location, prefix.actual.name, value);
         } else if (sort == Sort.DEF) {
             sub = new PSubDefField(location, value);
         } else {
@@ -157,4 +157,12 @@ public final class PField extends AStoreable {
     void store(MethodWriter writer, Globals globals) {
         sub.store(writer, globals);
     }
+
+    @Override
+    public String toString() {
+        if (nullSafe) {
+            return singleLineToString("nullSafe", prefix, value);
+        }
+        return singleLineToString(prefix, value);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubArrayLength.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubArrayLength.java
index 610bd2df77d..806f971850f 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubArrayLength.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubArrayLength.java
@@ -97,4 +97,9 @@ final class PSubArrayLength extends AStoreable {
     void store(MethodWriter writer, Globals globals) {
         throw new IllegalStateException("Illegal tree structure.");
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(prefix);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubBrace.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubBrace.java
index a6fb3cefbb1..1a12f23211e 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubBrace.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubBrace.java
@@ -96,4 +96,9 @@ final class PSubBrace extends AStoreable {
         writer.writeDebugInfo(location);
         writer.arrayStore(actual.type);
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(prefix, index);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubCallInvoke.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubCallInvoke.java
index 02dd89bb602..86553096e35 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubCallInvoke.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubCallInvoke.java
@@ -81,4 +81,9 @@ final class PSubCallInvoke extends AExpression {
 
         method.write(writer);
     }
+
+    @Override
+    public String toString() {
+        return singleLineToStringWithOptionalArgs(arguments, prefix, method.name);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubDefArray.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubDefArray.java
index 2776fffec61..c13c1bcb992 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubDefArray.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubDefArray.java
@@ -104,4 +104,9 @@ final class PSubDefArray extends AStoreable {
             org.objectweb.asm.Type.getMethodType(Definition.VOID_TYPE.type, Definition.DEF_TYPE.type, index.actual.type, actual.type);
         writer.invokeDefCall("arrayStore", methodType, DefBootstrap.ARRAY_STORE);
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(prefix, index);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubDefCall.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubDefCall.java
index 7f1d0dd1e95..d159834bd26 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubDefCall.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubDefCall.java
@@ -114,4 +114,9 @@ final class PSubDefCall extends AExpression {
         args.addAll(pointers);
         writer.invokeDefCall(name, methodType, DefBootstrap.METHOD_CALL, args.toArray());
     }
+
+    @Override
+    public String toString() {
+        return singleLineToStringWithOptionalArgs(arguments, prefix, name);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubDefField.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubDefField.java
index 8b098fa99f6..24c6c91422d 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubDefField.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubDefField.java
@@ -99,4 +99,9 @@ final class PSubDefField extends AStoreable {
             org.objectweb.asm.Type.getMethodType(Definition.VOID_TYPE.type, Definition.DEF_TYPE.type, actual.type);
         writer.invokeDefCall(value, methodType, DefBootstrap.STORE);
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(prefix, value);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubField.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubField.java
index 8b85a260d51..a7a01caac46 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubField.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubField.java
@@ -110,4 +110,9 @@ final class PSubField extends AStoreable {
             writer.putField(field.owner.type, field.javaName, field.type.type);
         }
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(prefix, field.name);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubListShortcut.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubListShortcut.java
index 5b8396f72d3..fc5cecc1b5e 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubListShortcut.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubListShortcut.java
@@ -134,4 +134,9 @@ final class PSubListShortcut extends AStoreable {
 
         writer.writePop(setter.rtn.sort.size);
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(prefix, index);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubMapShortcut.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubMapShortcut.java
index 183ee823752..c98aba5e1f0 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubMapShortcut.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubMapShortcut.java
@@ -137,4 +137,9 @@ final class PSubMapShortcut extends AStoreable {
 
         writer.writePop(setter.rtn.sort.size);
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(prefix, index);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubNullSafeCallInvoke.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubNullSafeCallInvoke.java
index 51349949dbd..6291e94252d 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubNullSafeCallInvoke.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubNullSafeCallInvoke.java
@@ -19,7 +19,6 @@
 
 package org.elasticsearch.painless.node;
 
-import org.elasticsearch.painless.Definition;
 import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
@@ -54,8 +53,7 @@ public class PSubNullSafeCallInvoke extends AExpression {
         guarded.analyze(locals);
         actual = guarded.actual;
         if (actual.sort.primitive) {
-            // Result must be nullable. We emit boxing instructions if needed.
-            actual = Definition.getType(actual.sort.boxed.getSimpleName());
+            throw new IllegalArgumentException("Result of null safe operator must be nullable");
         }
     }
 
@@ -67,10 +65,11 @@ public class PSubNullSafeCallInvoke extends AExpression {
         writer.dup();
         writer.ifNull(end);
         guarded.write(writer, globals);
-        if (guarded.actual.sort.primitive) {
-            // Box primitives so they are nullable
-            writer.box(guarded.actual.type);
-        }
         writer.mark(end);
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(guarded);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubNullSafeField.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubNullSafeField.java
index 32ad6c0cb62..de01ea710d9 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubNullSafeField.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubNullSafeField.java
@@ -20,7 +20,6 @@
 package org.elasticsearch.painless.node;
 
 import org.elasticsearch.painless.Definition.Type;
-import org.elasticsearch.painless.Definition;
 import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
@@ -54,8 +53,7 @@ public class PSubNullSafeField extends AStoreable {
         guarded.analyze(locals);
         actual = guarded.actual;
         if (actual.sort.primitive) {
-            // Result must be nullable. We emit boxing instructions if needed.
-            actual = Definition.getType(actual.sort.boxed.getSimpleName());
+            throw new IllegalArgumentException("Result of null safe operator must be nullable");
         }
     }
 
@@ -81,10 +79,6 @@ public class PSubNullSafeField extends AStoreable {
         writer.dup();
         writer.ifNull(end);
         guarded.write(writer, globals);
-        if (guarded.actual.sort.primitive) {
-            // Box primitives so they are nullable
-            writer.box(guarded.actual.type);
-        }
         writer.mark(end);
     }
 
@@ -102,4 +96,9 @@ public class PSubNullSafeField extends AStoreable {
     void store(MethodWriter writer, Globals globals) {
         throw createError(new IllegalArgumentException("Can't write to null safe field"));
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(guarded);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubShortcut.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubShortcut.java
index 34720a275db..5cd62f9fb1e 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubShortcut.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubShortcut.java
@@ -126,4 +126,9 @@ final class PSubShortcut extends AStoreable {
 
         writer.writePop(setter.rtn.sort.size);
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(prefix, value);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SBlock.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SBlock.java
index d81437242a8..43e0a62fb00 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SBlock.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SBlock.java
@@ -28,6 +28,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
+import static java.util.Collections.emptyList;
+
 /**
  * Represents a set of statements as a branch of control-flow.
  */
@@ -86,4 +88,9 @@ public final class SBlock extends AStatement {
             statement.write(writer, globals);
         }
     }
+
+    @Override
+    public String toString() {
+        return multilineToString(emptyList(), statements);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SBreak.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SBreak.java
index 71d737fcd66..bd446901e3a 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SBreak.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SBreak.java
@@ -56,4 +56,9 @@ public final class SBreak extends AStatement {
     void write(MethodWriter writer, Globals globals) {
         writer.goTo(brake);
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString();
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SCatch.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SCatch.java
index d73aead49c8..90940ae81d0 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SCatch.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SCatch.java
@@ -117,4 +117,9 @@ public final class SCatch extends AStatement {
             writer.goTo(exception);
         }
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(type, name, block);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SContinue.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SContinue.java
index 5504ae8b268..2cd1ed15cd2 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SContinue.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SContinue.java
@@ -59,4 +59,9 @@ public final class SContinue extends AStatement {
     void write(MethodWriter writer, Globals globals) {
         writer.goTo(continu);
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString();
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SDeclBlock.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SDeclBlock.java
index 4bade4625ee..95af41ba2b8 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SDeclBlock.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SDeclBlock.java
@@ -28,6 +28,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
+import static java.util.Collections.emptyList;
+
 /**
  * Represents a series of declarations.
  */
@@ -63,4 +65,9 @@ public final class SDeclBlock extends AStatement {
             declaration.write(writer, globals);
         }
     }
+
+    @Override
+    public String toString() {
+        return multilineToString(emptyList(), declarations);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SDeclaration.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SDeclaration.java
index c0911232d21..57477561f7f 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SDeclaration.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SDeclaration.java
@@ -101,4 +101,12 @@ public final class SDeclaration extends AStatement {
 
         writer.visitVarInsn(variable.type.type.getOpcode(Opcodes.ISTORE), variable.getSlot());
     }
+
+    @Override
+    public String toString() {
+        if (expression == null) {
+            return singleLineToString(type, name);
+        }
+        return singleLineToString(type, name, expression);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SDo.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SDo.java
index d63910683be..979bd4eec9f 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SDo.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SDo.java
@@ -125,4 +125,9 @@ public final class SDo extends AStatement {
         writer.goTo(start);
         writer.mark(end);
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(condition, block);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SEach.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SEach.java
index 6d0d0ee1bcc..04c9e6697cf 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SEach.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SEach.java
@@ -114,4 +114,9 @@ public class SEach extends AStatement {
     void write(MethodWriter writer, Globals globals) {
         sub.write(writer, globals);
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(type, name, expression, block);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SExpression.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SExpression.java
index 4493de09533..ab7a645c396 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SExpression.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SExpression.java
@@ -82,4 +82,9 @@ public final class SExpression extends AStatement {
             writer.writePop(expression.expected.sort.size);
         }
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(expression);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SFor.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SFor.java
index eb24ebb5e3f..18e7e11a7d1 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SFor.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SFor.java
@@ -27,8 +27,11 @@ import org.elasticsearch.painless.MethodWriter;
 import org.objectweb.asm.Label;
 import org.objectweb.asm.Opcodes;
 
+import java.util.Arrays;
 import java.util.Set;
 
+import static java.util.Collections.emptyList;
+
 /**
  * Represents a for loop.
  */
@@ -203,4 +206,9 @@ public final class SFor extends AStatement {
 
         writer.mark(end);
     }
+
+    @Override
+    public String toString() {
+        return multilineToString(emptyList(), Arrays.asList(initializer, condition, afterthought, block));
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SFunction.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SFunction.java
index 44afe828ef2..c1d90c942ac 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SFunction.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SFunction.java
@@ -46,6 +46,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 
+import static java.util.Collections.emptyList;
 import static org.elasticsearch.painless.WriterConstants.CLASS_TYPE;
 
 /**
@@ -53,9 +54,6 @@ import static org.elasticsearch.painless.WriterConstants.CLASS_TYPE;
  */
 public final class SFunction extends AStatement {
     public static final class FunctionReserved implements Reserved {
-        public static final String THIS = "#this";
-        public static final String LOOP = "#loop";
-
         private int maxLoopCounter = 0;
 
         public void markReserved(String name) {
@@ -63,7 +61,7 @@ public final class SFunction extends AStatement {
         }
 
         public boolean isReserved(String name) {
-            return name.equals(THIS) || name.equals(LOOP);
+            return Locals.FUNCTION_KEYWORDS.contains(name);
         }
 
         @Override
@@ -173,7 +171,7 @@ public final class SFunction extends AStatement {
         }
 
         if (reserved.getMaxLoopCounter() > 0) {
-            loop = locals.getVariable(null, FunctionReserved.LOOP);
+            loop = locals.getVariable(null, Locals.LOOP);
         }
     }
 
@@ -223,4 +221,15 @@ public final class SFunction extends AStatement {
                 false);
         writer.push(handle);
     }
+
+    @Override
+    public String toString() {
+        List<Object> description = new ArrayList<>();
+        description.add(rtnTypeStr);
+        description.add(name);
+        if (false == (paramTypeStrs.isEmpty() && paramNameStrs.isEmpty())) {
+            description.add(joinWithName("Args", pairwiseToString(paramTypeStrs, paramNameStrs), emptyList()));
+        }
+        return multilineToString(description, statements);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SIf.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SIf.java
index a266df464ea..08495cd8d7f 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SIf.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SIf.java
@@ -94,4 +94,9 @@ public final class SIf extends AStatement {
 
         writer.mark(fals);
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(condition, ifblock);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SIfElse.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SIfElse.java
index d36fb6cd370..4feb6b3fe62 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SIfElse.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SIfElse.java
@@ -27,9 +27,12 @@ import org.elasticsearch.painless.MethodWriter;
 import org.objectweb.asm.Label;
 import org.objectweb.asm.Opcodes;
 
+import java.util.Arrays;
 import java.util.Objects;
 import java.util.Set;
 
+import static java.util.Collections.singleton;
+
 /**
  * Represents an if/else block.
  */
@@ -128,4 +131,9 @@ public final class SIfElse extends AStatement {
 
         writer.mark(end);
     }
+
+    @Override
+    public String toString() {
+        return multilineToString(singleton(condition), Arrays.asList(ifblock, elseblock));
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SReturn.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SReturn.java
index e6986f5bdf6..f57d6339442 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SReturn.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SReturn.java
@@ -65,4 +65,9 @@ public final class SReturn extends AStatement {
         expression.write(writer, globals);
         writer.returnValue();
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(expression); 
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SSource.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SSource.java
index a4cf1cc8eee..dd4f56bb6a1 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SSource.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SSource.java
@@ -47,6 +47,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 
+import static java.util.Collections.emptyList;
 import static org.elasticsearch.painless.WriterConstants.BASE_CLASS_TYPE;
 import static org.elasticsearch.painless.WriterConstants.CLASS_TYPE;
 import static org.elasticsearch.painless.WriterConstants.CONSTRUCTOR;
@@ -89,7 +90,7 @@ public final class SSource extends AStatement {
 
         @Override
         public boolean isReserved(String name) {
-            return Locals.KEYWORDS.contains(name);
+            return Locals.MAIN_KEYWORDS.contains(name);
         }
 
         public boolean usesScore() {
@@ -332,4 +333,12 @@ public final class SSource extends AStatement {
     public byte[] getBytes() {
         return bytes;
     }
+
+    @Override
+    public String toString() {
+        List<Object> subs = new ArrayList<>(functions.size() + statements.size());
+        subs.addAll(functions);
+        subs.addAll(statements);
+        return multilineToString(emptyList(), subs);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SSubEachArray.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SSubEachArray.java
index 2841aff46bb..edbad88e2c2 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SSubEachArray.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SSubEachArray.java
@@ -107,4 +107,9 @@ final class SSubEachArray extends AStatement {
         writer.goTo(begin);
         writer.mark(end);
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(variable.type.name, variable.name, expression, block);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SSubEachIterable.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SSubEachIterable.java
index 57acb07aa6a..5a1410d0343 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SSubEachIterable.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SSubEachIterable.java
@@ -129,4 +129,9 @@ final class SSubEachIterable extends AStatement {
         writer.goTo(begin);
         writer.mark(end);
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(variable.type.name, variable.name, expression, block);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SThrow.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SThrow.java
index b3442b2f2ee..e87d862b2ac 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SThrow.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SThrow.java
@@ -64,4 +64,9 @@ public final class SThrow extends AStatement {
         expression.write(writer, globals);
         writer.throwException();
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(expression);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/STry.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/STry.java
index 47dc955a914..d9cd2da0f92 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/STry.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/STry.java
@@ -29,6 +29,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
+import static java.util.Collections.singleton;
+
 /**
  * Represents the try block as part of a try-catch block.
  */
@@ -124,4 +126,9 @@ public final class STry extends AStatement {
             writer.mark(exception);
         }
     }
+
+    @Override
+    public String toString() {
+        return multilineToString(singleton(block), catches);
+    }
 }
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SWhile.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SWhile.java
index 514ba801bbf..7663c853a0c 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SWhile.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SWhile.java
@@ -134,4 +134,9 @@ public final class SWhile extends AStatement {
 
         writer.mark(end);
     }
+
+    @Override
+    public String toString() {
+        return singleLineToString(condition, block);
+    }
 }
diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/BasicExpressionTests.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/BasicExpressionTests.java
index f35ffc77f7b..7c0694d67ba 100644
--- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/BasicExpressionTests.java
+++ b/modules/lang-painless/src/test/java/org/elasticsearch/painless/BasicExpressionTests.java
@@ -148,29 +148,46 @@ public class BasicExpressionTests extends ScriptTestCase {
 
     public void testNullSafeDeref() {
         // Objects in general
-        assertNull(                      exec("String a = null; return a?.toString()"));   // Call
-        assertNull(                      exec("String a = null; return a?.length()"));     // Call and box
-        assertEquals("foo",              exec("String a = 'foo'; return a?.toString()"));  // Call
-        assertEquals(Integer.valueOf(3), exec("String a = 'foo'; return a?.length()"));    // Call and box
+        //   Call
+        assertNull(         exec("String a = null;  return a?.toString()"));
+        assertEquals("foo", exec("String a = 'foo'; return a?.toString()"));
+        assertNull(         exec("def    a = null;  return a?.toString()"));
+        assertEquals("foo", exec("def    a = 'foo'; return a?.toString()"));
+        //   Call with primitive result
+        assertMustBeNullable(    "String a = null; return a?.length()");
+        assertMustBeNullable(    "String a = 'foo'; return a?.length()");
+        assertNull(         exec("def    a = null;  return a?.length()"));
+        assertEquals(3,     exec("def    a = 'foo'; return a?.length()"));
+        //   Read shortcut
+        assertMustBeNullable(    "org.elasticsearch.painless.FeatureTest a = null; return a?.x");
+        assertMustBeNullable(
+                "org.elasticsearch.painless.FeatureTest a = new org.elasticsearch.painless.FeatureTest(); return a?.x");
+        assertNull(         exec("def    a = null;  return a?.x"));
+        assertEquals(0,     exec("def    a = new org.elasticsearch.painless.FeatureTest(); return a?.x"));
 
         // Maps
-        assertNull(        exec("Map a = null;        return a?.toString()"));  // Call
-        assertNull(        exec("Map a = null;        return a?.size()"));      // Call and box
+        //   Call
+        assertNull(        exec("Map a = null;        return a?.toString()"));
+        assertEquals("{}", exec("Map a = [:];         return a?.toString()"));
+        assertNull(        exec("def a = null;        return a?.toString()"));
+        assertEquals("{}", exec("def a = [:];         return a?.toString()"));
+        //   Call with primitive result
+        assertMustBeNullable(   "Map a = [:];  return a?.size()");
+        assertMustBeNullable(   "Map a = null; return a?.size()");
+        assertNull(        exec("def a = null;        return a?.size()"));
+        assertEquals(0,    exec("def a = [:];         return a?.size()"));
+        //   Read shortcut
         assertNull(        exec("Map a = null;        return a?.other"));       // Read shortcut
-        assertEquals("{}", exec("Map a = [:];         return a?.toString()"));  // Call
-        assertEquals(0,    exec("Map a = [:];         return a?.size()"));      // Call and box
         assertEquals(1,    exec("Map a = ['other':1]; return a?.other"));       // Read shortcut
+        assertNull(        exec("def a = null;        return a?.other"));       // Read shortcut
+        assertEquals(1,    exec("def a = ['other':1]; return a?.other"));       // Read shortcut
 
         // Array
         // Since you can't invoke methods on arrays we skip the toString and hashCode tests
-        assertNull(     exec("int[] a = null;             return a?.length"));  // Length (boxed)
-        assertEquals(2, exec("int[] a = new int[] {2, 3}; return a?.length"));  // Length (boxed)
-
-        // Def
-        assertNull(     exec("def a = null;                                         return a?.getX()"));  // Invoke
-        assertNull(     exec("def a = null;                                         return a?.x"));       // Read shortcut
-        assertEquals(0, exec("def a = new org.elasticsearch.painless.FeatureTest(); return a?.getX()"));  // Invoke
-        assertEquals(0, exec("def a = new org.elasticsearch.painless.FeatureTest(); return a?.x"));       // Read shortcut
+        assertMustBeNullable("int[] a = null;             return a?.length");
+        assertMustBeNullable("int[] a = new int[] {2, 3}; return a?.length");
+        assertNull(     exec("def a = null;               return a?.length"));
+        assertEquals(2, exec("def a = new int[] {2, 3};   return a?.length"));
 
         // Results from maps (should just work but let's test anyway)
         FeatureTest t = new FeatureTest();
@@ -193,7 +210,7 @@ public class BasicExpressionTests extends ScriptTestCase {
         assertEquals(0, exec("def a = ['other': ['cat': params.t]]; return a.other?.cat?.getX()", singletonMap("t", t), true));
         assertEquals(0, exec("def a = ['other': ['cat': params.t]]; return a.other?.cat?.x",      singletonMap("t", t), true));
 
-        // Check that we don't try to cast when the LHS doesn't provide an "expected" value
+        // Assignments
         assertNull(exec(
                     "def a = [:];\n"
                   + "a.missing_length = a.missing?.length();\n"
@@ -214,4 +231,9 @@ public class BasicExpressionTests extends ScriptTestCase {
 //        assertEquals(null, exec("Map a = ['thing': 'bar']; a.other?.cat?.dog = 'wombat'; return a.other?.cat?.dog"));
 //        assertEquals(null, exec("def a = ['thing': 'bar']; a.other?.cat?.dog = 'wombat'; return a.other?.cat?.dog"));
     }
+
+    private void assertMustBeNullable(String script) {
+        Exception e = expectScriptThrows(IllegalArgumentException.class , () -> exec(script));
+        assertEquals("Result of null safe operator must be nullable", e.getMessage());
+    }
 }
diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/ElvisTests.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/ElvisTests.java
new file mode 100644
index 00000000000..44859852240
--- /dev/null
+++ b/modules/lang-painless/src/test/java/org/elasticsearch/painless/ElvisTests.java
@@ -0,0 +1,143 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.painless;
+
+import static java.util.Collections.singletonMap;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.lessThan;
+
+/**
+ * Tests for the Elvis operator ({@code ?:}).
+ */
+public class ElvisTests extends ScriptTestCase {
+    public void testBasics() {
+        // Basics
+        assertEquals("str", exec("return params.a ?: 'str'"));
+        assertEquals("str", exec("return params.a ?: 'str2'", singletonMap("a", "str"), true));
+        assertEquals("str", exec("return params.a ?: 'asdf'", singletonMap("a", "str"), true));
+
+        // Assigning to a primitive
+        assertCannotReturnPrimitive("int i = params.a ?: 1; return i");
+        assertCannotReturnPrimitive("Integer a = Integer.valueOf(1); int b = a ?: 2; return b");
+        assertCannotReturnPrimitive("Integer a = Integer.valueOf(1); int b = a ?: Integer.valueOf(2); return b");
+
+        // Assigning to an object
+        assertEquals(1, exec("Integer i = params.a ?: Integer.valueOf(1); return i"));
+        assertEquals(1, exec("Integer i = params.a ?: Integer.valueOf(2); return i", singletonMap("a", 1), true));
+        assertEquals(1, exec("Integer a = Integer.valueOf(1); Integer b = a ?: Integer.valueOf(2); return b"));
+        assertEquals(2, exec("Integer a = null; Integer b = a ?: Integer.valueOf(2); return b"));
+
+        // Explicit casting
+        assertEquals(1, exec("return (Integer)(params.a ?: Integer.valueOf(1))"));
+        assertEquals(1, exec("return (Integer)(params.a ?: Integer.valueOf(2))", singletonMap("a", 1), true));
+        assertCannotReturnPrimitive("return (int)(params.a ?: 1)");
+
+        // Now some chains
+        assertEquals(1, exec("return params.a ?: params.a ?: 1"));
+        assertEquals(1, exec("return params.a ?: params.b ?: 'j'", singletonMap("b", 1), true));
+        assertEquals(1, exec("return params.a ?: params.b ?: 'j'", singletonMap("a", 1), true));
+
+        // Precedence
+        assertEquals(1, exec("return params.a ?: 2 + 2", singletonMap("a", 1), true));
+        assertEquals(4, exec("return params.a ?: 2 + 2"));
+        assertEquals(2, exec("return params.a + 1 ?: 2 + 2", singletonMap("a", 1), true)); // Yes, this is silly, but it should be valid
+
+        // Weird casts
+        assertEquals(1,     exec("int i = params.i;     String s = params.s; return s ?: i", singletonMap("i", 1), true));
+        assertEquals("str", exec("Integer i = params.i; String s = params.s; return s ?: i", singletonMap("s", "str"), true));
+
+        // Combining
+        assertEquals(2, exec("return (params.a ?: 0) + 1", singletonMap("a", 1), true));
+        assertEquals(1, exec("return (params.a ?: 0) + 1"));
+        assertEquals(2, exec("return (params.a ?: ['b': 10]).b + 1", singletonMap("a", singletonMap("b", 1)), true));
+        assertEquals(11, exec("return (params.a ?: ['b': 10]).b + 1"));
+    }
+
+    public void testWithNullSafeDereferences() {
+        assertEquals(1, exec("return params.a?.b ?: 1"));
+        assertEquals(1, exec("return params.a?.b ?: 2", singletonMap("a", singletonMap("b", 1)), true));
+
+        // TODO This could be expanded to allow primitives where neither of the two operations allow them alone
+    }
+
+    public void testLazy() {
+        assertEquals(1, exec("def fail() {throw new RuntimeException('test')} return params.a ?: fail()", singletonMap("a", 1), true));
+        Exception e = expectScriptThrows(RuntimeException.class, () ->
+            exec("def fail() {throw new RuntimeException('test')} return params.a ?: fail()"));
+        assertEquals(e.getMessage(), "test");
+    }
+
+    /**
+     * Checks that {@code a ?: b ?: c} is be parsed as {@code a ?: (b ?: c)} instead of {@code (a ?: b) ?: c} which is nice because the
+     * first one only needs one comparison if the {@code a} is non-null while the second one needs two.
+     */
+    public void testRightAssociative() {
+        checkOneBranch("params.a ?: (params.b ?: params.c)", true);
+        checkOneBranch("(params.a ?: params.b) ?: params.c", false);
+        checkOneBranch("params.a ?: params.b ?: params.c", true);
+    }
+
+    private void checkOneBranch(String code, boolean expectOneBranch) {
+        /* Sadly this is a super finicky about the output of the disassembly but I think it is worth having because it makes sure that
+         * the code generated for the elvis operator is as efficient as possible. */
+        String disassembled = Debugger.toString(code);
+        int firstLookup = disassembled.indexOf("INVOKEINTERFACE java/util/Map.get (Ljava/lang/Object;)Ljava/lang/Object;");
+        assertThat(disassembled, firstLookup, greaterThan(-1));
+        int firstElvisDestinationLabelIndex = disassembled.indexOf("IFNONNULL L", firstLookup);
+        assertThat(disassembled, firstElvisDestinationLabelIndex, greaterThan(-1));
+        String firstElvisDestinationLabel = disassembled.substring(firstElvisDestinationLabelIndex + "IFNONNULL ".length(),
+                disassembled.indexOf('\n', firstElvisDestinationLabelIndex));
+        int firstElvisDestionation = disassembled.indexOf("   " + firstElvisDestinationLabel);
+        assertThat(disassembled, firstElvisDestionation, greaterThan(-1));
+        int ifAfterFirstElvisDestination = disassembled.indexOf("IF", firstElvisDestionation);
+        if (expectOneBranch) {
+            assertThat(disassembled, ifAfterFirstElvisDestination, lessThan(0));
+        } else {
+            assertThat(disassembled, ifAfterFirstElvisDestination, greaterThan(-1));
+        }
+        int returnAfterFirstElvisDestination = disassembled.indexOf("RETURN", firstElvisDestionation);
+        assertThat(disassembled, returnAfterFirstElvisDestination, greaterThan(-1));
+    }
+
+    public void testExtraneous() {
+        Exception e = expectScriptThrows(IllegalArgumentException.class, () -> exec("int i = params.a; return i ?: 1"));
+        assertEquals("Extraneous elvis operator. LHS is a primitive.", e.getMessage());
+        expectScriptThrows(IllegalArgumentException.class, () -> exec("int i = params.a; return i + 10 ?: 'ignored'"));
+        assertEquals("Extraneous elvis operator. LHS is a primitive.", e.getMessage());
+        e = expectScriptThrows(IllegalArgumentException.class, () -> exec("return 'cat' ?: 1"));
+        assertEquals("Extraneous elvis operator. LHS is a constant.", e.getMessage());
+        e = expectScriptThrows(IllegalArgumentException.class, () -> exec("return null ?: 'j'"));
+        assertEquals("Extraneous elvis operator. LHS is null.", e.getMessage());
+        e = expectScriptThrows(IllegalArgumentException.class, () -> exec("return params.a ?: null ?: 'j'"));
+        assertEquals("Extraneous elvis operator. LHS is null.", e.getMessage());
+        e = expectScriptThrows(IllegalArgumentException.class, () -> exec("return params.a ?: null"));
+        assertEquals("Extraneous elvis operator. RHS is null.", e.getMessage());
+    }
+
+    public void testQuestionSpaceColonIsNotElvis() {
+        Exception e = expectScriptThrows(IllegalArgumentException.class, () -> exec("return params.a ? : 1", false));
+        assertEquals("invalid sequence of tokens near [':'].", e.getMessage());
+    }
+
+    private void assertCannotReturnPrimitive(String script) {
+        Exception e = expectScriptThrows(IllegalArgumentException.class, () -> exec(script));
+        assertEquals("Evlis operator cannot return primitives", e.getMessage());
+    }
+}
diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/LambdaTests.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/LambdaTests.java
index 6bb800eb92c..4958942b2a2 100644
--- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/LambdaTests.java
+++ b/modules/lang-painless/src/test/java/org/elasticsearch/painless/LambdaTests.java
@@ -19,61 +19,64 @@
 
 package org.elasticsearch.painless;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class LambdaTests extends ScriptTestCase {
 
     public void testNoArgLambda() {
         assertEquals(1, exec("Optional.empty().orElseGet(() -> 1);"));
     }
-    
+
     public void testNoArgLambdaDef() {
         assertEquals(1, exec("def x = Optional.empty(); x.orElseGet(() -> 1);"));
     }
-    
+
     public void testLambdaWithArgs() {
-        assertEquals("short", exec("List l = new ArrayList(); l.add('looooong'); l.add('short'); " 
+        assertEquals("short", exec("List l = new ArrayList(); l.add('looooong'); l.add('short'); "
                                  + "l.sort((a, b) -> a.length() - b.length()); return l.get(0)"));
 
     }
-    
+
     public void testLambdaWithTypedArgs() {
-        assertEquals("short", exec("List l = new ArrayList(); l.add('looooong'); l.add('short'); " 
+        assertEquals("short", exec("List l = new ArrayList(); l.add('looooong'); l.add('short'); "
                                  + "l.sort((String a, String b) -> a.length() - b.length()); return l.get(0)"));
 
     }
-    
+
     public void testPrimitiveLambdas() {
         assertEquals(4, exec("List l = new ArrayList(); l.add(1); l.add(1); "
                            + "return l.stream().mapToInt(x -> x + 1).sum();"));
     }
-    
+
     public void testPrimitiveLambdasWithTypedArgs() {
         assertEquals(4, exec("List l = new ArrayList(); l.add(1); l.add(1); "
                            + "return l.stream().mapToInt(int x -> x + 1).sum();"));
     }
-    
+
     public void testPrimitiveLambdasDef() {
         assertEquals(4, exec("def l = new ArrayList(); l.add(1); l.add(1); "
                            + "return l.stream().mapToInt(x -> x + 1).sum();"));
     }
-    
+
     public void testPrimitiveLambdasWithTypedArgsDef() {
         assertEquals(4, exec("def l = new ArrayList(); l.add(1); l.add(1); "
                            + "return l.stream().mapToInt(int x -> x + 1).sum();"));
     }
-    
+
     public void testPrimitiveLambdasConvertible() {
         assertEquals(2, exec("List l = new ArrayList(); l.add(1); l.add(1); "
                            + "return l.stream().mapToInt(byte x -> x).sum();"));
     }
-    
+
     public void testPrimitiveArgs() {
         assertEquals(2, exec("int applyOne(IntFunction arg) { arg.apply(1) } applyOne(x -> x + 1)"));
     }
-    
+
     public void testPrimitiveArgsTyped() {
         assertEquals(2, exec("int applyOne(IntFunction arg) { arg.apply(1) } applyOne(int x -> x + 1)"));
     }
-    
+
     public void testPrimitiveArgsTypedOddly() {
         assertEquals(2L, exec("long applyOne(IntFunction arg) { arg.apply(1) } applyOne(long x -> x + 1)"));
     }
@@ -85,7 +88,7 @@ public class LambdaTests extends ScriptTestCase {
     public void testUnneededCurlyStatements() {
         assertEquals(2, exec("int applyOne(IntFunction arg) { arg.apply(1) } applyOne(x -> { x + 1 })"));
     }
-    
+
     /** interface ignores return value */
     public void testVoidReturn() {
         assertEquals(2, exec("List list = new ArrayList(); "
@@ -94,7 +97,7 @@ public class LambdaTests extends ScriptTestCase {
                            + "list.forEach(x -> list2.add(x));"
                            + "return list[0]"));
     }
-    
+
     /** interface ignores return value */
     public void testVoidReturnDef() {
         assertEquals(2, exec("def list = new ArrayList(); "
@@ -121,15 +124,15 @@ public class LambdaTests extends ScriptTestCase {
                                "}" +
                                "return sum;"));
     }
-    
+
     public void testCapture() {
         assertEquals(5, exec("int x = 5; return Optional.empty().orElseGet(() -> x);"));
     }
-    
+
     public void testTwoCaptures() {
         assertEquals("1test", exec("int x = 1; String y = 'test'; return Optional.empty().orElseGet(() -> x + y);"));
     }
-    
+
     public void testCapturesAreReadOnly() {
         IllegalArgumentException expected = expectScriptThrows(IllegalArgumentException.class, () -> {
             exec("List l = new ArrayList(); l.add(1); l.add(1); "
@@ -137,13 +140,13 @@ public class LambdaTests extends ScriptTestCase {
         });
         assertTrue(expected.getMessage().contains("is read-only"));
     }
-    
+
     @AwaitsFix(bugUrl = "def type tracking")
     public void testOnlyCapturesAreReadOnly() {
         assertEquals(4, exec("List l = new ArrayList(); l.add(1); l.add(1); "
                            + "return l.stream().mapToInt(x -> { x += 1; return x }).sum();"));
     }
-    
+
     /** Lambda parameters shouldn't be able to mask a variable already in scope */
     public void testNoParamMasking() {
         IllegalArgumentException expected = expectScriptThrows(IllegalArgumentException.class, () -> {
@@ -156,31 +159,31 @@ public class LambdaTests extends ScriptTestCase {
     public void testCaptureDef() {
         assertEquals(5, exec("int x = 5; def y = Optional.empty(); y.orElseGet(() -> x);"));
     }
-    
+
     public void testNestedCapture() {
         assertEquals(1, exec("boolean x = false; int y = 1;" +
                              "return Optional.empty().orElseGet(() -> x ? 5 : Optional.empty().orElseGet(() -> y));"));
     }
-    
+
     public void testNestedCaptureParams() {
         assertEquals(2, exec("int foo(Function f) { return f.apply(1) }" +
                              "return foo(x -> foo(y -> x + 1))"));
     }
-    
+
     public void testWrongArity() {
         IllegalArgumentException expected = expectScriptThrows(IllegalArgumentException.class, () -> {
             exec("Optional.empty().orElseGet(x -> x);");
         });
         assertTrue(expected.getMessage().contains("Incorrect number of parameters"));
     }
-    
+
     public void testWrongArityDef() {
         IllegalArgumentException expected = expectScriptThrows(IllegalArgumentException.class, () -> {
             exec("def y = Optional.empty(); return y.orElseGet(x -> x);");
         });
         assertTrue(expected.getMessage(), expected.getMessage().contains("Incorrect number of parameters"));
     }
-    
+
     public void testWrongArityNotEnough() {
         IllegalArgumentException expected = expectScriptThrows(IllegalArgumentException.class, () -> {
             exec("List l = new ArrayList(); l.add(1); l.add(1); "
@@ -188,7 +191,7 @@ public class LambdaTests extends ScriptTestCase {
         });
         assertTrue(expected.getMessage().contains("Incorrect number of parameters"));
     }
-    
+
     public void testWrongArityNotEnoughDef() {
         IllegalArgumentException expected = expectScriptThrows(IllegalArgumentException.class, () -> {
             exec("def l = new ArrayList(); l.add(1); l.add(1); "
@@ -196,12 +199,36 @@ public class LambdaTests extends ScriptTestCase {
         });
         assertTrue(expected.getMessage().contains("Incorrect number of parameters"));
     }
-    
+
     public void testLambdaInFunction() {
         assertEquals(5, exec("def foo() { Optional.empty().orElseGet(() -> 5) } return foo();"));
     }
-    
+
     public void testLambdaCaptureFunctionParam() {
         assertEquals(5, exec("def foo(int x) { Optional.empty().orElseGet(() -> x) } return foo(5);"));
     }
+
+    public void testReservedCapture() {
+        String compare = "boolean compare(Supplier s, def v) {s.get() == v}";
+        assertEquals(true, exec(compare + "compare(() -> new ArrayList(), new ArrayList())"));
+        assertEquals(true, exec(compare + "compare(() -> { new ArrayList() }, new ArrayList())"));
+
+        Map<String, Object> params = new HashMap<>();
+        params.put("key", "value");
+        params.put("number", 2);
+
+        assertEquals(true, exec(compare + "compare(() -> { return params['key'] }, 'value')", params, true));
+        assertEquals(false, exec(compare + "compare(() -> { return params['nokey'] }, 'value')", params, true));
+        assertEquals(true, exec(compare + "compare(() -> { return params['nokey'] }, null)", params, true));
+        assertEquals(true, exec(compare + "compare(() -> { return params['number'] }, 2)", params, true));
+        assertEquals(false, exec(compare + "compare(() -> { return params['number'] }, 'value')", params, true));
+        assertEquals(false, exec(compare + "compare(() -> { if (params['number'] == 2) { return params['number'] }" +
+            "else { return params['key'] } }, 'value')", params, true));
+        assertEquals(true, exec(compare + "compare(() -> { if (params['number'] == 2) { return params['number'] }" +
+            "else { return params['key'] } }, 2)", params, true));
+        assertEquals(true, exec(compare + "compare(() -> { if (params['number'] == 1) { return params['number'] }" +
+            "else { return params['key'] } }, 'value')", params, true));
+        assertEquals(false, exec(compare + "compare(() -> { if (params['number'] == 1) { return params['number'] }" +
+            "else { return params['key'] } }, 2)", params, true));
+    }
 }
diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/WhenThingsGoWrongTests.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/WhenThingsGoWrongTests.java
index 664394a6d81..f23b13341cc 100644
--- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/WhenThingsGoWrongTests.java
+++ b/modules/lang-painless/src/test/java/org/elasticsearch/painless/WhenThingsGoWrongTests.java
@@ -261,4 +261,10 @@ public class WhenThingsGoWrongTests extends ScriptTestCase {
         e = expectScriptThrows(IllegalArgumentException.class, () -> exec("return -92233720368547758070"));
         assertEquals("Invalid int constant [-92233720368547758070].", e.getMessage());
     }
+
+    public void testQuestionSpaceDotIsNotNullSafeDereference() {
+        Exception e = expectScriptThrows(IllegalArgumentException.class, () -> exec("return params.a? .b", false));
+        assertEquals("invalid sequence of tokens near ['.'].", e.getMessage());
+    }
+
 }
diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/node/NodeToStringTests.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/node/NodeToStringTests.java
new file mode 100644
index 00000000000..53d564de87d
--- /dev/null
+++ b/modules/lang-painless/src/test/java/org/elasticsearch/painless/node/NodeToStringTests.java
@@ -0,0 +1,905 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.painless.node;
+
+import org.elasticsearch.painless.CompilerSettings;
+import org.elasticsearch.painless.Definition;
+import org.elasticsearch.painless.Definition.Cast;
+import org.elasticsearch.painless.Definition.Field;
+import org.elasticsearch.painless.Definition.Method;
+import org.elasticsearch.painless.Definition.MethodKey;
+import org.elasticsearch.painless.Definition.RuntimeClass;
+import org.elasticsearch.painless.Definition.Struct;
+import org.elasticsearch.painless.FeatureTest;
+import org.elasticsearch.painless.Locals.Variable;
+import org.elasticsearch.painless.Location;
+import org.elasticsearch.painless.Operation;
+import org.elasticsearch.painless.antlr.Walker;
+import org.elasticsearch.test.ESTestCase;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+
+/**
+ * Tests {@link Object#toString} implementations on all extensions of {@link ANode}.
+ */
+public class NodeToStringTests extends ESTestCase {
+    public void testEAssignment() {
+        assertToString(
+                "(SSource\n"
+              + "  (SDeclBlock (SDeclaration def i))\n"
+              + "  (SExpression (EAssignment (EVariable i) = (ENumeric 2)))\n"
+              + "  (SReturn (EVariable i)))",
+                "def i;\n"
+              + "i = 2;\n"
+              + "return i");
+        for (String operator : new String[] {"+", "-", "*", "/", "%", "&", "^", "|", "<<", ">>", ">>>"}) {
+            assertToString(
+                    "(SSource\n"
+                  + "  (SDeclBlock (SDeclaration def i (ENumeric 1)))\n"
+                  + "  (SExpression (EAssignment (EVariable i) " + operator + "= (ENumeric 2)))\n"
+                  + "  (SReturn (EVariable i)))",
+                    "def i = 1;\n"
+                  + "i " + operator + "= 2;\n"
+                  + "return i");
+        }
+        // Compound
+        assertToString(
+                "(SSource\n"
+              + "  (SDeclBlock (SDeclaration def i))\n"
+              + "  (SReturn (EAssignment (EVariable i) = (ENumeric 2))))",
+                "def i;\n"
+              + "return i = 2");
+        assertToString(
+                "(SSource\n"
+              + "  (SDeclBlock (SDeclaration def i))\n"
+              + "  (SReturn (EAssignment (EVariable i) ++ post)))",
+                "def i;\n"
+              + "return i++");
+        assertToString(
+                "(SSource\n"
+              + "  (SDeclBlock (SDeclaration def i))\n"
+              + "  (SReturn (EAssignment (EVariable i) ++ pre)))",
+                "def i;\n"
+              + "return ++i");
+        assertToString(
+                "(SSource\n"
+              + "  (SDeclBlock (SDeclaration def i))\n"
+              + "  (SReturn (EAssignment (EVariable i) -- post)))",
+                "def i;\n"
+              + "return i--");
+        assertToString(
+                "(SSource\n"
+              + "  (SDeclBlock (SDeclaration def i))\n"
+              + "  (SReturn (EAssignment (EVariable i) -- pre)))",
+                "def i;\n"
+              + "return --i");
+    }
+
+    public void testEBinary() {
+        assertToString(     "(SSource (SReturn (EBinary (ENumeric 1) * (ENumeric 1))))", "return 1 * 1");
+        assertToString(     "(SSource (SReturn (EBinary (ENumeric 1) / (ENumeric 1))))", "return 1 / 1");
+        assertToString(     "(SSource (SReturn (EBinary (ENumeric 1) % (ENumeric 1))))", "return 1 % 1");
+        assertToString(     "(SSource (SReturn (EBinary (ENumeric 1) + (ENumeric 1))))", "return 1 + 1");
+        assertToString(     "(SSource (SReturn (EBinary (ENumeric 1) - (ENumeric 1))))", "return 1 - 1");
+        assertToString( "(SSource (SReturn (EBinary (EString 'asb') =~ (ERegex /cat/))))", "return 'asb' =~ /cat/");
+        assertToString("(SSource (SReturn (EBinary (EString 'asb') ==~ (ERegex /cat/))))", "return 'asb' ==~ /cat/");
+        assertToString(    "(SSource (SReturn (EBinary (ENumeric 1) << (ENumeric 1))))", "return 1 << 1");
+        assertToString(    "(SSource (SReturn (EBinary (ENumeric 1) >> (ENumeric 1))))", "return 1 >> 1");
+        assertToString(   "(SSource (SReturn (EBinary (ENumeric 1) >>> (ENumeric 1))))", "return 1 >>> 1");
+        assertToString(     "(SSource (SReturn (EBinary (ENumeric 1) & (ENumeric 1))))", "return 1 & 1");
+        assertToString(     "(SSource (SReturn (EBinary (ENumeric 1) ^ (ENumeric 1))))", "return 1 ^ 1");
+        assertToString(     "(SSource (SReturn (EBinary (ENumeric 1) | (ENumeric 1))))", "return 1 | 1");
+    }
+
+    public void testEBool() {
+        assertToString("(SSource (SReturn (EBool (EBoolean true) && (EBoolean false))))", "return true && false");
+        assertToString("(SSource (SReturn (EBool (EBoolean true) || (EBoolean false))))", "return true || false");
+    }
+
+    public void testEBoolean() {
+        assertToString("(SSource (SReturn (EBoolean true)))",  "return true");
+        assertToString("(SSource (SReturn (EBoolean false)))", "return false");
+    }
+
+    public void testECallLocal() {
+        assertToString(
+                "(SSource\n"
+              + "  (SFunction def a\n"
+              + "    (SReturn (EBoolean true)))\n"
+              + "  (SReturn (ECallLocal a)))",
+                "def a() {\n"
+              + "  return true\n"
+              + "}\n"
+              + "return a()");
+        assertToString(
+                "(SSource\n"
+              + "  (SFunction def a (Args (Pair int i) (Pair int j))\n"
+              + "    (SReturn (EBoolean true)))\n"
+              + "  (SReturn (ECallLocal a (Args (ENumeric 1) (ENumeric 2)))))",
+                "def a(int i, int j) {\n"
+              + "  return true\n"
+              + "}\n"
+              + "return a(1, 2)");
+    }
+
+    public void testECapturingFunctionRef() {
+        assertToString(
+                  "(SSource\n"
+                + "  (SDeclBlock (SDeclaration Integer x (PCallInvoke (EStatic Integer) valueOf (Args (ENumeric 5)))))\n"
+                + "  (SReturn (PCallInvoke (PCallInvoke (EStatic Optional) empty) orElseGet (Args (ECapturingFunctionRef x toString)))))",
+                  "Integer x = Integer.valueOf(5);\n"
+                + "return Optional.empty().orElseGet(x::toString)");
+    }
+
+    public void testECast() {
+        Location l = new Location(getTestName(), 0);
+        AExpression child = new EConstant(l, "test");
+        Cast cast = new Cast(Definition.STRING_TYPE, Definition.INT_OBJ_TYPE, true);
+        assertEquals("(ECast Integer (EConstant String 'test'))", new ECast(l, child, cast).toString());
+
+        l = new Location(getTestName(), 1);
+        child = new EBinary(l, Operation.ADD, new EConstant(l, "test"), new EConstant(l, 12));
+        cast = new Cast(Definition.INT_OBJ_TYPE, Definition.BOOLEAN_OBJ_TYPE, true);
+        assertEquals("(ECast Boolean (EBinary (EConstant String 'test') + (EConstant Integer 12)))", new ECast(l, child, cast).toString());
+    }
+
+    public void testEComp() {
+        assertToString(  "(SSource (SReturn (EComp (PField (EVariable params) a) < (ENumeric 10))))", "return params.a < 10");
+        assertToString( "(SSource (SReturn (EComp (PField (EVariable params) a) <= (ENumeric 10))))", "return params.a <= 10");
+        assertToString(  "(SSource (SReturn (EComp (PField (EVariable params) a) > (ENumeric 10))))", "return params.a > 10");
+        assertToString( "(SSource (SReturn (EComp (PField (EVariable params) a) >= (ENumeric 10))))", "return params.a >= 10");
+        assertToString( "(SSource (SReturn (EComp (PField (EVariable params) a) == (ENumeric 10))))", "return params.a == 10");
+        assertToString("(SSource (SReturn (EComp (PField (EVariable params) a) === (ENumeric 10))))", "return params.a === 10");
+        assertToString( "(SSource (SReturn (EComp (PField (EVariable params) a) != (ENumeric 10))))", "return params.a != 10");
+        assertToString("(SSource (SReturn (EComp (PField (EVariable params) a) !== (ENumeric 10))))", "return params.a !== 10");
+    }
+
+    public void testEConditional() {
+        assertToString("(SSource (SReturn (EConditional (PField (EVariable params) a) (ENumeric 1) (ENumeric 6))))",
+                "return params.a ? 1 : 6");
+    }
+
+    public void testEConstant() {
+        assertEquals("(EConstant String '121')", new EConstant(new Location(getTestName(), 0), "121").toString());
+        assertEquals("(EConstant String '92 ')", new EConstant(new Location(getTestName(), 0), "92 ").toString());
+        assertEquals("(EConstant Integer 1237)", new EConstant(new Location(getTestName(), 1), 1237).toString());
+        assertEquals("(EConstant Boolean true)", new EConstant(new Location(getTestName(), 2), true).toString());
+    }
+
+    public void testEDecimal() {
+        assertToString("(SSource (SReturn (EDecimal 1.0)))", "return 1.0");
+        assertToString("(SSource (SReturn (EDecimal 14.121d)))", "return 14.121d");
+        assertToString("(SSource (SReturn (EDecimal 2234.1f)))", "return 2234.1f");
+        assertToString("(SSource (SReturn (EDecimal 14.121D)))", "return 14.121D");
+        assertToString("(SSource (SReturn (EDecimal 1234.1F)))", "return 1234.1F");
+    }
+
+    public void testEElvis() {
+        assertToString("(SSource (SReturn (EElvis (PField (EVariable params) a) (ENumeric 1))))", "return params.a ?: 1");
+    }
+
+    public void testEExplicit() {
+        assertToString("(SSource (SReturn (EExplicit byte (PField (EVariable params) a))))", "return (byte)(params.a)");
+    }
+
+    public void testEFunctionRef() {
+        assertToString(
+                "(SSource (SReturn "
+                        + "(PCallInvoke (PCallInvoke (EStatic Optional) empty) orElseGet (Args (EFunctionRef Optional empty)))))",
+                "return Optional.empty().orElseGet(Optional::empty)");
+    }
+
+    public void testEInstanceOf() {
+        assertToString("(SSource (SReturn (EInstanceof (ENewObj Object) Object)))", "return new Object() instanceof Object");
+        assertToString("(SSource (SReturn (EInstanceof (ENumeric 12) double)))", "return 12 instanceof double");
+    }
+
+    public void testELambda() {
+        assertToString(
+                  "(SSource (SReturn (PCallInvoke (PCallInvoke (EStatic Optional) empty) orElseGet (Args "
+                + "(ELambda (SReturn (ENumeric 1)))))))",
+                  "return Optional.empty().orElseGet(() -> {\n"
+                + "  return 1\n"
+                + "})");
+        assertToString(
+                  "(SSource (SReturn (PCallInvoke (PCallInvoke (EStatic Optional) empty) orElseGet (Args "
+                + "(ELambda (SReturn (ENumeric 1)))))))",
+                  "return Optional.empty().orElseGet(() -> 1)");
+        assertToString(
+                  "(SSource (SReturn (PCallInvoke (PCallInvoke (PCallInvoke (EListInit (ENumeric 1) (ENumeric 2) (ENumeric 3)) stream) "
+                + "mapToInt (Args (ELambda (Pair def x)\n"
+                + "  (SReturn (EBinary (EVariable x) + (ENumeric 1)))))) sum)))",
+                  "return [1, 2, 3].stream().mapToInt((def x) -> {\n"
+                + "  return x + 1\n"
+                + "}).sum()");
+        assertToString(
+                  "(SSource (SReturn (PCallInvoke (PCallInvoke (PCallInvoke (EListInit (ENumeric 1) (ENumeric 2) (ENumeric 3)) stream) "
+                + "mapToInt (Args (ELambda (Pair def x)\n"
+                + "  (SReturn (EBinary (EVariable x) + (ENumeric 1)))))) sum)))",
+                  "return [1, 2, 3].stream().mapToInt(x -> x + 1).sum()");
+        assertToString(
+                  "(SSource (SReturn (PCallInvoke (EListInit (EString 'a') (EString 'b')) sort (Args (ELambda (Pair def a) (Pair def b)\n"
+                + "  (SReturn (EBinary (PCallInvoke (EVariable a) length) - (PCallInvoke (EVariable b) length))))))))",
+                  "return ['a', 'b'].sort((def a, def b) -> {\n"
+                + "  return a.length() - b.length()\n"
+                + "})");
+        assertToString(
+                  "(SSource (SReturn (PCallInvoke (EListInit (EString 'a') (EString 'b')) sort (Args (ELambda (Pair def a) (Pair def b)\n"
+                + "  (SReturn (EBinary (PCallInvoke (EVariable a) length) - (PCallInvoke (EVariable b) length))))))))",
+                  "return ['a', 'b'].sort((a, b) -> a.length() - b.length())");
+        assertToString(
+                "(SSource (SReturn (PCallInvoke (EListInit (EString 'a') (EString 'b')) sort (Args (ELambda (Pair def a) (Pair def b)\n"
+              + "  (SIf (EComp (EVariable a) < (EVariable b)) (SBlock "
+                  + "(SReturn (EBinary (PCallInvoke (EVariable a) length) - (PCallInvoke (EVariable b) length)))))\n"
+              + "  (SReturn (ENumeric 1)))))))",
+                "return ['a', 'b'].sort((def a, def b) -> {\n"
+              + "  if (a < b) {\n"
+              + "    return a.length() - b.length()\n"
+              + "  }\n"
+              + "  return 1\n"
+              + "})");
+    }
+
+    public void testEListInit() {
+        assertToString("(SSource (SReturn (EListInit (ENumeric 1) (ENumeric 2) (EString 'cat') (EString 'dog') (ENewObj Object))))",
+                "return [1, 2, 'cat', 'dog', new Object()]");
+        assertToString("(SSource (SReturn (EListInit)))", "return []");
+    }
+
+    public void testEMapInit() {
+        assertToString("(SSource (SReturn (EMapInit "
+                    + "(Pair (EString 'a') (ENumeric 1)) "
+                    + "(Pair (EString 'b') (ENumeric 3)) "
+                    + "(Pair (ENumeric 12) (ENewObj Object)))))",
+                "return ['a': 1, 'b': 3, 12: new Object()]");
+        assertToString("(SSource (SReturn (EMapInit)))", "return [:]");
+    }
+
+    public void testENewArray() {
+        assertToString("(SSource (SReturn (ENewArray int dims (Args (ENumeric 10)))))", "return new int[10]");
+        assertToString("(SSource (SReturn (ENewArray int dims (Args (ENumeric 10) (ENumeric 4) (ENumeric 5)))))",
+                "return new int[10][4][5]");
+        assertToString("(SSource (SReturn (ENewArray int init (Args (ENumeric 1) (ENumeric 2) (ENumeric 3)))))",
+                "return new int[] {1, 2, 3}");
+        assertToString("(SSource (SReturn (ENewArray def init (Args (ENumeric 1) (ENumeric 2) (EString 'bird')))))",
+                "return new def[] {1, 2, 'bird'}");
+    }
+
+    public void testENewObj() {
+        assertToString("(SSource (SReturn (ENewObj Object)))", "return new Object()");
+        assertToString("(SSource (SReturn (ENewObj DateTimeException (Args (EString 'test')))))", "return new DateTimeException('test')");
+    }
+
+    public void testENull() {
+        assertToString("(SSource (SReturn (ENull)))", "return null");
+    }
+
+    public void testENumeric() {
+        assertToString("(SSource (SReturn (ENumeric 1)))", "return 1");
+        assertToString("(SSource (SReturn (ENumeric 114121d)))", "return 114121d");
+        assertToString("(SSource (SReturn (ENumeric 114134f)))", "return 114134f");
+        assertToString("(SSource (SReturn (ENumeric 114121D)))", "return 114121D");
+        assertToString("(SSource (SReturn (ENumeric 111234F)))", "return 111234F");
+        assertToString("(SSource (SReturn (ENumeric 774121l)))", "return 774121l");
+        assertToString("(SSource (SReturn (ENumeric 881234L)))", "return 881234L");
+
+        assertToString("(SSource (SReturn (ENumeric 1 16)))", "return 0x1");
+        assertToString("(SSource (SReturn (ENumeric 774121l 16)))", "return 0x774121l");
+        assertToString("(SSource (SReturn (ENumeric 881234L 16)))", "return 0x881234L");
+
+        assertToString("(SSource (SReturn (ENumeric 1 8)))", "return 01");
+        assertToString("(SSource (SReturn (ENumeric 774121l 8)))", "return 0774121l");
+        assertToString("(SSource (SReturn (ENumeric 441234L 8)))", "return 0441234L");
+    }
+
+    public void testERegex() {
+        assertToString("(SSource (SReturn (ERegex /foo/)))", "return /foo/");
+        assertToString("(SSource (SReturn (ERegex /foo/ cix)))", "return /foo/cix");
+        assertToString("(SSource (SReturn (ERegex /foo/ cix)))", "return /foo/xci");
+    }
+
+    public void testEStatic() {
+        assertToString("(SSource (SReturn (PCallInvoke (EStatic Optional) empty)))", "return Optional.empty()");
+    }
+
+    public void testEString() {
+        assertToString("(SSource (SReturn (EString 'foo')))", "return 'foo'");
+        assertToString("(SSource (SReturn (EString ' oo')))", "return ' oo'");
+        assertToString("(SSource (SReturn (EString 'fo ')))", "return 'fo '");
+        assertToString("(SSource (SReturn (EString ' o ')))", "return ' o '");
+    }
+
+    public void testEUnary() {
+        assertToString("(SSource (SReturn (EUnary ! (EBoolean true))))", "return !true");
+        assertToString("(SSource (SReturn (EUnary ~ (ENumeric 1))))", "return ~1");
+        assertToString("(SSource (SReturn (EUnary + (ENumeric 1))))", "return +1");
+        assertToString("(SSource (SReturn (EUnary - (ENumeric 1))))", "return -(1)");
+    }
+
+    public void testEVariable() {
+        assertToString("(SSource (SReturn (EVariable params)))", "return params");
+        assertToString(
+                  "(SSource\n"
+                + "  (SDeclBlock (SDeclaration def a (ENumeric 1)))\n"
+                + "  (SReturn (EVariable a)))",
+                  "def a = 1;\n"
+                + "return a");
+    }
+
+    public void testPBrace() {
+        assertToString("(SSource (SReturn (PBrace (PField (EVariable params) a) (ENumeric 10))))", "return params.a[10]");
+        assertToString("(SSource (SReturn (PBrace (EVariable params) (EString 'a'))))", "return params['a']");
+    }
+
+    public void testPCallInvoke() {
+        assertToString("(SSource (SReturn (PCallInvoke (EStatic Optional) empty)))", "return Optional.empty()");
+        assertToString("(SSource (SReturn (PCallInvoke (EStatic Optional) of (Args (ENumeric 1)))))", "return Optional.of(1)");
+        assertToString("(SSource (SReturn (PCallInvoke (EStatic Objects) equals (Args (ENumeric 1) (ENumeric 2)))))",
+                "return Objects.equals(1, 2)");
+        assertToString("(SSource (SReturn (PCallInvoke (EVariable params) equals (Args (ENumeric 1)))))", "return params.equals(1)");
+    }
+
+    public void testPField() {
+        assertToString("(SSource (SReturn (PField (EVariable params) a)))", "return params.a");
+        assertToString("(SSource (SReturn (PField nullSafe (EVariable params) a)))", "return params?.a");
+        assertToString(
+                  "(SSource\n"
+                + "  (SDeclBlock (SDeclaration int[] a (ENewArray int dims (Args (ENumeric 10)))))\n"
+                + "  (SReturn (PField (EVariable a) length)))", 
+                  "int[] a = new int[10];\n"
+                + "return a.length");
+        assertToString(
+                "(SSource\n"
+              + "  (SDeclBlock (SDeclaration org.elasticsearch.painless.FeatureTest a (ENewObj org.elasticsearch.painless.FeatureTest)))\n"
+              + "  (SExpression (EAssignment (PField (EVariable a) x) = (ENumeric 10)))\n"
+              + "  (SReturn (PField (EVariable a) x)))", 
+                "org.elasticsearch.painless.FeatureTest a = new org.elasticsearch.painless.FeatureTest();\n"
+              + "a.x = 10;\n"
+              + "return a.x");
+    }
+
+    public void testPSubArrayLength() {
+        Location l = new Location(getTestName(), 0);
+        PSubArrayLength node = new PSubArrayLength(l, "int", "a");
+        node.prefix = new EVariable(l, "a");
+        assertEquals("(PSubArrayLength (EVariable a))", node.toString());
+        assertEquals("(PSubNullSafeField (PSubArrayLength (EVariable a)))", new PSubNullSafeField(l, node).toString());
+    }
+
+    public void testPSubBrace() {
+        Location l = new Location(getTestName(), 0);
+        PSubBrace node = new PSubBrace(l, Definition.INT_TYPE, new ENumeric(l, "1", 10));
+        node.prefix = new EVariable(l, "a");
+        assertEquals("(PSubBrace (EVariable a) (ENumeric 1))", node.toString());
+    }
+
+    public void testPSubCallInvoke() {
+        Location l = new Location(getTestName(), 0);
+        RuntimeClass c = Definition.getRuntimeClass(Integer.class);
+        Method m = c.methods.get(new MethodKey("toString", 0));
+        PSubCallInvoke node = new PSubCallInvoke(l, m, null, emptyList());
+        node.prefix = new EVariable(l, "a");
+        assertEquals("(PSubCallInvoke (EVariable a) toString)", node.toString());
+        assertEquals("(PSubNullSafeCallInvoke (PSubCallInvoke (EVariable a) toString))", new PSubNullSafeCallInvoke(l, node).toString());
+
+        l = new Location(getTestName(), 1);
+        m = c.methods.get(new MethodKey("equals", 1));
+        node = new PSubCallInvoke(l, m, null, singletonList(new EVariable(l, "b")));
+        node.prefix = new EVariable(l, "a");
+        assertEquals("(PSubCallInvoke (EVariable a) equals (Args (EVariable b)))", node.toString());
+        assertEquals("(PSubNullSafeCallInvoke (PSubCallInvoke (EVariable a) equals (Args (EVariable b))))",
+                new PSubNullSafeCallInvoke(l, node).toString());
+    }
+
+    public void testPSubDefArray() {
+        Location l = new Location(getTestName(), 0);
+        PSubDefArray node = new PSubDefArray(l, new EConstant(l, 1));
+        node.prefix = new EVariable(l, "a");
+        assertEquals("(PSubDefArray (EVariable a) (EConstant Integer 1))", node.toString());
+    }
+
+    public void testPSubDefCall() {
+        Location l = new Location(getTestName(), 0);
+        PSubDefCall node = new PSubDefCall(l, "toString", emptyList());
+        node.prefix = new EVariable(l, "a");
+        assertEquals("(PSubDefCall (EVariable a) toString)", node.toString());
+        assertEquals("(PSubNullSafeCallInvoke (PSubDefCall (EVariable a) toString))", new PSubNullSafeCallInvoke(l, node).toString());
+
+        l = new Location(getTestName(), 0);
+        node = new PSubDefCall(l, "equals", singletonList(new EVariable(l, "b")));
+        node.prefix = new EVariable(l, "a");
+        assertEquals("(PSubDefCall (EVariable a) equals (Args (EVariable b)))", node.toString());
+        assertEquals("(PSubNullSafeCallInvoke (PSubDefCall (EVariable a) equals (Args (EVariable b))))",
+                new PSubNullSafeCallInvoke(l, node).toString());
+
+        l = new Location(getTestName(), 0);
+        node = new PSubDefCall(l, "superWeird", Arrays.asList(new EVariable(l, "b"), new EVariable(l, "c"), new EVariable(l, "d")));
+        node.prefix = new EVariable(l, "a");
+        assertEquals("(PSubDefCall (EVariable a) superWeird (Args (EVariable b) (EVariable c) (EVariable d)))", node.toString());
+        assertEquals("(PSubNullSafeCallInvoke (PSubDefCall (EVariable a) superWeird (Args (EVariable b) (EVariable c) (EVariable d))))",
+                new PSubNullSafeCallInvoke(l, node).toString());
+    }
+
+    public void testPSubDefField() {
+        Location l = new Location(getTestName(), 0);
+        PSubDefField node = new PSubDefField(l, "ok");
+        node.prefix = new EVariable(l, "a");
+        assertEquals("(PSubDefField (EVariable a) ok)", node.toString());
+        assertEquals("(PSubNullSafeCallInvoke (PSubDefField (EVariable a) ok))", new PSubNullSafeCallInvoke(l, node).toString());
+    }
+
+    public void testPSubField() {
+        Location l = new Location(getTestName(), 0);
+        Struct s = Definition.getType(Boolean.class.getSimpleName()).struct;
+        Field f = s.staticMembers.get("TRUE");
+        PSubField node = new PSubField(l, f);
+        node.prefix = new EStatic(l, "Boolean");
+        assertEquals("(PSubField (EStatic Boolean) TRUE)", node.toString());
+        assertEquals("(PSubNullSafeCallInvoke (PSubField (EStatic Boolean) TRUE))", new PSubNullSafeCallInvoke(l, node).toString());
+    }
+
+    public void testPSubListShortcut() {
+        Location l = new Location(getTestName(), 0);
+        Struct s = Definition.getType(List.class.getSimpleName()).struct;
+        PSubListShortcut node = new PSubListShortcut(l, s, new EConstant(l, 1));
+        node.prefix = new EVariable(l, "a");
+        assertEquals("(PSubListShortcut (EVariable a) (EConstant Integer 1))", node.toString());
+        assertEquals("(PSubNullSafeCallInvoke (PSubListShortcut (EVariable a) (EConstant Integer 1)))",
+                new PSubNullSafeCallInvoke(l, node).toString());
+
+        l = new Location(getTestName(), 0);
+        s = Definition.getType(List.class.getSimpleName()).struct;
+        node = new PSubListShortcut(l, s, new EBinary(l, Operation.ADD, new EConstant(l, 1), new EConstant(l, 4)));
+        node.prefix = new EVariable(l, "a");
+        assertEquals("(PSubListShortcut (EVariable a) (EBinary (EConstant Integer 1) + (EConstant Integer 4)))", node.toString());
+    }
+
+    public void testPSubMapShortcut() {
+        Location l = new Location(getTestName(), 0);
+        Struct s = Definition.getType(Map.class.getSimpleName()).struct;
+        PSubMapShortcut node = new PSubMapShortcut(l, s, new EConstant(l, "cat"));
+        node.prefix = new EVariable(l, "a");
+        assertEquals("(PSubMapShortcut (EVariable a) (EConstant String 'cat'))", node.toString());
+        assertEquals("(PSubNullSafeCallInvoke (PSubMapShortcut (EVariable a) (EConstant String 'cat')))",
+                new PSubNullSafeCallInvoke(l, node).toString());
+
+        l = new Location(getTestName(), 1);
+        s = Definition.getType(Map.class.getSimpleName()).struct;
+        node = new PSubMapShortcut(l, s, new EBinary(l, Operation.ADD, new EConstant(l, 1), new EConstant(l, 4)));
+        node.prefix = new EVariable(l, "a");
+        assertEquals("(PSubMapShortcut (EVariable a) (EBinary (EConstant Integer 1) + (EConstant Integer 4)))", node.toString());
+    }
+
+    public void testPSubShortcut() {
+        Location l = new Location(getTestName(), 0);
+        Struct s = Definition.getType(FeatureTest.class.getName()).struct;
+        Method getter = s.methods.get(new MethodKey("getX", 0));
+        Method setter = s.methods.get(new MethodKey("setX", 1));
+        PSubShortcut node = new PSubShortcut(l, "x", FeatureTest.class.getName(), getter, setter);
+        node.prefix = new EVariable(l, "a");
+        assertEquals("(PSubShortcut (EVariable a) x)", node.toString());
+        assertEquals("(PSubNullSafeCallInvoke (PSubShortcut (EVariable a) x))",
+                new PSubNullSafeCallInvoke(l, node).toString());
+    }
+
+    public void testSBreak() {
+        assertToString(
+                "(SSource\n"
+              + "  (SDeclBlock (SDeclaration int itr (ENumeric 2)))\n"
+              + "  (SDeclBlock (SDeclaration int a (ENumeric 1)))\n"
+              + "  (SDeclBlock (SDeclaration int b (ENumeric 1)))\n"
+              + "  (SDo (EComp (EVariable b) < (ENumeric 1000)) (SBlock\n"
+              + "    (SExpression (EAssignment (EVariable itr) ++ post))\n"
+              + "    (SIf (EComp (EVariable itr) > (ENumeric 10000)) (SBlock (SBreak)))\n"
+              + "    (SDeclBlock (SDeclaration int tmp (EVariable a)))\n"
+              + "    (SExpression (EAssignment (EVariable a) = (EVariable b)))\n"
+              + "    (SExpression (EAssignment (EVariable b) = (EBinary (EVariable tmp) + (EVariable b))))))\n"
+              + "  (SReturn (EVariable b)))",
+                "int itr = 2;\n"
+              + "int a = 1;\n"
+              + "int b = 1;\n"
+              + "do {\n"
+              + "  itr++;\n"
+              + "  if (itr > 10000) {\n"
+              + "    break\n"
+              + "  }\n"
+              + "  int tmp = a;\n"
+              + "  a = b;\n"
+              + "  b = tmp + b\n"
+              + "} while (b < 1000);\n"
+              + "return b");
+    }
+
+    public void testSContinue() {
+        assertToString(
+                "(SSource\n"
+              + "  (SDeclBlock (SDeclaration int itr (ENumeric 2)))\n"
+              + "  (SDeclBlock (SDeclaration int a (ENumeric 1)))\n"
+              + "  (SDeclBlock (SDeclaration int b (ENumeric 1)))\n"
+              + "  (SDo (EComp (EVariable b) < (ENumeric 1000)) (SBlock\n"
+              + "    (SExpression (EAssignment (EVariable itr) ++ post))\n"
+              + "    (SIf (EComp (EVariable itr) < (ENumeric 10000)) (SBlock (SContinue)))\n"
+              + "    (SDeclBlock (SDeclaration int tmp (EVariable a)))\n"
+              + "    (SExpression (EAssignment (EVariable a) = (EVariable b)))\n"
+              + "    (SExpression (EAssignment (EVariable b) = (EBinary (EVariable tmp) + (EVariable b))))))\n"
+              + "  (SReturn (EVariable b)))",
+                "int itr = 2;\n"
+              + "int a = 1;\n"
+              + "int b = 1;\n"
+              + "do {\n"
+              + "  itr++;\n"
+              + "  if (itr < 10000) {\n"
+              + "    continue\n"
+              + "  }\n"
+              + "  int tmp = a;\n"
+              + "  a = b;\n"
+              + "  b = tmp + b\n"
+              + "} while (b < 1000);\n"
+              + "return b");
+    }
+
+    public void testSDeclBlock() {
+        assertToString(
+                  "(SSource\n"
+                + "  (SDeclBlock (SDeclaration def a))\n"
+                + "  (SExpression (EAssignment (EVariable a) = (ENumeric 10)))\n"
+                + "  (SReturn (EVariable a)))",
+                  "def a;\n"
+                + "a = 10;\n"
+                + "return a");
+        assertToString(
+                "(SSource\n"
+              + "  (SDeclBlock (SDeclaration def a (ENumeric 10)))\n"
+              + "  (SReturn (EVariable a)))",
+                "def a = 10;\n"
+              + "return a");
+        assertToString(
+                "(SSource\n"
+              + "  (SDeclBlock\n"
+              + "    (SDeclaration def a)\n"
+              + "    (SDeclaration def b)\n"
+              + "    (SDeclaration def c))\n"
+              + "  (SReturn (EVariable a)))",
+                "def a, b, c;\n"
+              + "return a");
+        assertToString(
+                "(SSource\n"
+              + "  (SDeclBlock\n"
+              + "    (SDeclaration def a (ENumeric 10))\n"
+              + "    (SDeclaration def b (ENumeric 20))\n"
+              + "    (SDeclaration def c (ENumeric 100)))\n"
+              + "  (SReturn (EVariable a)))",
+                "def a = 10, b = 20, c = 100;\n"
+              + "return a");
+        assertToString(
+                "(SSource\n"
+              + "  (SDeclBlock\n"
+              + "    (SDeclaration def a (ENumeric 10))\n"
+              + "    (SDeclaration def b)\n"
+              + "    (SDeclaration def c (ENumeric 100)))\n"
+              + "  (SReturn (EVariable a)))",
+                "def a = 10, b, c = 100;\n"
+              + "return a");
+        assertToString(
+                "(SSource\n"
+              + "  (SIf (PField (EVariable params) a) (SBlock\n"
+              + "    (SDeclBlock\n"
+              + "      (SDeclaration def a (ENumeric 10))\n"
+              + "      (SDeclaration def b)\n"
+              + "      (SDeclaration def c (ENumeric 100)))\n"
+              + "    (SReturn (EVariable a))))\n"
+              + "  (SReturn (EBoolean false)))",
+                "if (params.a) {"
+              + "  def a = 10, b, c = 100;\n"
+              + "  return a\n"
+              + "}\n"
+              + "return false");
+    }
+
+    public void testSDo() {
+        assertToString(
+                  "(SSource\n"
+                + "  (SDeclBlock (SDeclaration int itr (ENumeric 2)))\n"
+                + "  (SDeclBlock (SDeclaration int a (ENumeric 1)))\n"
+                + "  (SDeclBlock (SDeclaration int b (ENumeric 1)))\n"
+                + "  (SDo (EComp (EVariable b) < (ENumeric 1000)) (SBlock\n"
+                + "    (SExpression (EAssignment (EVariable itr) ++ post))\n"
+                + "    (SDeclBlock (SDeclaration int tmp (EVariable a)))\n"
+                + "    (SExpression (EAssignment (EVariable a) = (EVariable b)))\n"
+                + "    (SExpression (EAssignment (EVariable b) = (EBinary (EVariable tmp) + (EVariable b))))))\n"
+                + "  (SReturn (EVariable b)))",
+                  "int itr = 2;\n"
+                + "int a = 1;\n"
+                + "int b = 1;\n"
+                + "do {\n"
+                + "  itr++;\n"
+                + "  int tmp = a;\n"
+                + "  a = b;\n"
+                + "  b = tmp + b\n"
+                + "} while (b < 1000);\n"
+                + "return b");
+    }
+
+    public void testSEach() {
+        assertToString(
+                "(SSource\n"
+              + "  (SDeclBlock (SDeclaration int l (ENumeric 0)))\n"
+              + "  (SEach String s (EListInit (EString 'cat') (EString 'dog') (EString 'chicken')) (SBlock "
+                  + "(SExpression (EAssignment (EVariable l) += (PCallInvoke (EVariable s) length)))))\n"
+              + "  (SReturn (EVariable l)))",
+                  "int l = 0;\n"
+                + "for (String s : ['cat', 'dog', 'chicken']) {\n"
+                + "  l += s.length()\n"
+                + "}\n"
+                + "return l");
+        assertToString(
+                "(SSource\n"
+              + "  (SDeclBlock (SDeclaration int l (ENumeric 0)))\n"
+              + "  (SEach String s (EListInit (EString 'cat') (EString 'dog') (EString 'chicken')) (SBlock\n"
+              + "    (SDeclBlock (SDeclaration String s2 (EBinary (EString 'dire ') + (EVariable s))))\n"
+              + "    (SExpression (EAssignment (EVariable l) += (PCallInvoke (EVariable s2) length)))))\n"
+              + "  (SReturn (EVariable l)))",
+                "int l = 0;\n"
+              + "for (String s : ['cat', 'dog', 'chicken']) {\n"
+              + "  String s2 = 'dire ' + s;\n"
+              + "  l += s2.length()\n"
+              + "}\n"
+              + "return l");
+    }
+
+    public void testSFor() {
+        assertToString(
+                "(SSource\n"
+              + "  (SDeclBlock (SDeclaration int sum (ENumeric 0)))\n"
+              + "  (SFor\n"
+              + "    (SDeclBlock (SDeclaration int i (ENumeric 0)))\n"
+              + "    (EComp (EVariable i) < (ENumeric 1000))\n"
+              + "    (EAssignment (EVariable i) ++ post)\n"
+              + "    (SBlock (SExpression (EAssignment (EVariable sum) += (EVariable i)))))\n"
+              + "  (SReturn (EVariable sum)))",
+                  "int sum = 0;\n"
+                + "for (int i = 0; i < 1000; i++) {\n"
+                + "  sum += i\n"
+                + "}\n"
+                + "return sum");
+        assertToString(
+                "(SSource\n"
+              + "  (SDeclBlock (SDeclaration int sum (ENumeric 0)))\n"
+              + "  (SFor\n"
+              + "    (SDeclBlock (SDeclaration int i (ENumeric 0)))\n"
+              + "    (EComp (EVariable i) < (ENumeric 1000))\n"
+              + "    (EAssignment (EVariable i) ++ post)\n"
+              + "    (SBlock (SFor\n"
+              + "      (SDeclBlock (SDeclaration int j (ENumeric 0)))\n"
+              + "      (EComp (EVariable j) < (ENumeric 1000))\n"
+              + "      (EAssignment (EVariable j) ++ post)\n"
+              + "      (SBlock (SExpression (EAssignment (EVariable sum) += (EBinary (EVariable i) * (EVariable j))))))))\n"
+              + "  (SReturn (EVariable sum)))",
+                "int sum = 0;\n"
+              + "for (int i = 0; i < 1000; i++) {\n"
+              + "  for (int j = 0; j < 1000; j++) {\n"
+              + "    sum += i * j\n"
+              + "  }\n"
+              + "}\n"
+              + "return sum");
+    }
+
+    public void testSIf() {
+        assertToString(
+                "(SSource (SIf (PField (EVariable param) a) (SBlock (SReturn (EBoolean true)))))",
+                  "if (param.a) {\n"
+                + "  return true\n"
+                +"}");
+        assertToString(
+                "(SSource (SIf (PField (EVariable param) a) (SBlock\n"
+              + "  (SIf (PField (EVariable param) b) (SBlock (SReturn (EBoolean true))))\n"
+              + "  (SReturn (EBoolean false)))))",
+                "if (param.a) {\n"
+              + "  if (param.b) {\n"
+              + "    return true\n"
+              + "  }\n"
+              + "  return false\n"
+              +"}");
+    }
+
+    public void testSIfElse() {
+        assertToString(
+                  "(SSource (SIfElse (PField (EVariable param) a)\n"
+                + "  (SBlock (SReturn (EBoolean true)))\n"
+                + "  (SBlock (SReturn (EBoolean false)))))",
+                  "if (param.a) {\n"
+                + "  return true\n"
+                + "} else {\n"
+                + "  return false\n"
+                + "}");
+        assertToString(
+                "(SSource\n"
+              + "  (SDeclBlock (SDeclaration int i (ENumeric 0)))\n"
+              + "  (SIfElse (PField (EVariable param) a)\n"
+              + "    (SBlock (SIfElse (PField (EVariable param) b)\n"
+              + "      (SBlock (SReturn (EBoolean true)))\n"
+              + "      (SBlock (SReturn (EString 'cat')))))\n"
+              + "    (SBlock (SReturn (EBoolean false)))))",
+                "int i = 0;\n"
+              + "if (param.a) {\n"
+              + "  if (param.b) {\n"
+              + "    return true\n"
+              + "  } else {\n"
+              + "    return 'cat'\n"
+              + "  }\n"
+              + "} else {"
+              + "  return false\n"
+              + "}");
+    }
+
+    public void testSSubEachArray() {
+        Location l = new Location(getTestName(), 0);
+        Variable v = new Variable(l, "test", Definition.INT_TYPE, 5, false);
+        AExpression e = new ENewArray(l, "int", Arrays.asList(new EConstant(l, 1), new EConstant(l, 2), new EConstant(l, 3)), true);
+        SBlock b = new SBlock(l, singletonList(new SReturn(l, new EConstant(l, 5))));
+        SSubEachArray node = new SSubEachArray(l, v, e, b);
+        assertEquals(
+                "(SSubEachArray int test (ENewArray int init (Args (EConstant Integer 1) (EConstant Integer 2) (EConstant Integer 3))) "
+              + "(SBlock (SReturn (EConstant Integer 5))))",
+                node.toString());
+    }
+
+    public void testSSubEachIterable() {
+        Location l = new Location(getTestName(), 0);
+        Variable v = new Variable(l, "test", Definition.INT_TYPE, 5, false);
+        AExpression e = new EListInit(l, Arrays.asList(new EConstant(l, 1), new EConstant(l, 2), new EConstant(l, 3)));
+        SBlock b = new SBlock(l, singletonList(new SReturn(l, new EConstant(l, 5))));
+        SSubEachIterable node = new SSubEachIterable(l, v, e, b);
+        assertEquals(
+                  "(SSubEachIterable int test (EListInit (EConstant Integer 1) (EConstant Integer 2) (EConstant Integer 3)) (SBlock "
+                + "(SReturn (EConstant Integer 5))))",
+                  node.toString());
+    }
+
+    public void testSThrow() {
+        assertToString("(SSource (SThrow (ENewObj RuntimeException)))", "throw new RuntimeException()");
+    }
+
+    public void testSWhile() {
+        assertToString(
+                  "(SSource\n"
+                + "  (SDeclBlock (SDeclaration int i (ENumeric 0)))\n"
+                + "  (SWhile (EComp (EVariable i) < (ENumeric 10)) (SBlock (SExpression (EAssignment (EVariable i) ++ post))))\n"
+                + "  (SReturn (EVariable i)))",
+                  "int i = 0;\n"
+                + "while (i < 10) {\n"
+                + "  i++\n"
+                + "}\n"
+                + "return i");
+    }
+
+    public void testSFunction() {
+        assertToString(
+                  "(SSource\n"
+                + "  (SFunction def a\n"
+                + "    (SReturn (EBoolean true)))\n"
+                + "  (SReturn (EBoolean true)))",
+                  "def a() {\n"
+                + "  return true\n"
+                + "}\n"
+                + "return true");
+        assertToString(
+                "(SSource\n"
+              + "  (SFunction def a (Args (Pair int i) (Pair int j))\n"
+              + "    (SReturn (EBoolean true)))\n"
+              + "  (SReturn (EBoolean true)))",
+                "def a(int i, int j) {\n"
+              + "  return true\n"
+              + "}\n"
+              + "return true");
+        assertToString(
+                "(SSource\n"
+              + "  (SFunction def a (Args (Pair int i) (Pair int j))\n"
+              + "    (SIf (EComp (EVariable i) < (EVariable j)) (SBlock (SReturn (EBoolean true))))\n"
+              + "    (SDeclBlock (SDeclaration int k (EBinary (EVariable i) + (EVariable j))))\n"
+              + "    (SReturn (EVariable k)))\n"
+              + "  (SReturn (EBoolean true)))",
+                "def a(int i, int j) {\n"
+              + "  if (i < j) {\n"
+              + "    return true\n"
+              + "  }\n"
+              + "  int k = i + j;\n"
+              + "  return k\n"
+              + "}\n"
+              + "return true");
+        assertToString(
+                "(SSource\n"
+              + "  (SFunction def a\n"
+              + "    (SReturn (EBoolean true)))\n"
+              + "  (SFunction def b\n"
+              + "    (SReturn (EBoolean false)))\n"
+              + "  (SReturn (EBoolean true)))",
+                "def a() {\n"
+              + "  return true\n"
+              + "}\n"
+              + "def b() {\n"
+              + "  return false\n"
+              + "}\n"
+              + "return true");
+    }
+
+    public void testSTryAndSCatch() {
+        assertToString(
+                  "(SSource (STry (SBlock (SReturn (ENumeric 1)))\n"
+                + "  (SCatch Exception e (SBlock (SReturn (ENumeric 2))))))",
+                  "try {\n"
+                + "  return 1\n"
+                + "} catch (Exception e) {\n"
+                + "  return 2\n"
+                + "}");
+        assertToString(
+                "(SSource (STry (SBlock\n"
+              + "  (SDeclBlock (SDeclaration int i (ENumeric 1)))\n"
+              + "  (SReturn (ENumeric 1)))\n"
+              + "  (SCatch Exception e (SBlock (SReturn (ENumeric 2))))))",
+                "try {\n"
+              + "  int i = 1;"
+              + "  return 1\n"
+              + "} catch (Exception e) {\n"
+              + "  return 2\n"
+              + "}");
+        assertToString(
+                "(SSource (STry (SBlock (SReturn (ENumeric 1)))\n"
+              + "  (SCatch Exception e (SBlock\n"
+              + "    (SDeclBlock (SDeclaration int i (ENumeric 1)))\n"
+              + "    (SReturn (ENumeric 2))))))",
+                "try {\n"
+              + "  return 1\n"
+              + "} catch (Exception e) {"
+              + "  int i = 1;\n"
+              + "  return 2\n"
+              + "}");
+        assertToString(
+                "(SSource (STry (SBlock (SReturn (ENumeric 1)))\n"
+              + "  (SCatch NullPointerException e (SBlock (SReturn (ENumeric 2))))\n"
+              + "  (SCatch Exception e (SBlock (SReturn (ENumeric 3))))))",
+                "try {\n"
+              + "  return 1\n"
+              + "} catch (NullPointerException e) {\n"
+              + "  return 2\n"
+              + "} catch (Exception e) {\n"
+              + "  return 3\n"
+              + "}");
+    }
+
+    private void assertToString(String expected, String code) {
+        assertEquals(expected, walk(code).toString());
+    }
+
+    private SSource walk(String code) {
+        CompilerSettings compilerSettings = new CompilerSettings();
+        compilerSettings.setRegexesEnabled(true);
+        try {
+            return Walker.buildPainlessTree(getTestName(), code, compilerSettings, null);
+        } catch (Exception e) {
+            throw new AssertionError("Failed to compile: " + code, e);
+        }
+    }
+}
diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/plan_a/20_scriptfield.yaml b/modules/lang-painless/src/test/resources/rest-api-spec/test/plan_a/20_scriptfield.yaml
index 902c6950245..f626a77bf93 100644
--- a/modules/lang-painless/src/test/resources/rest-api-spec/test/plan_a/20_scriptfield.yaml
+++ b/modules/lang-painless/src/test/resources/rest-api-spec/test/plan_a/20_scriptfield.yaml
@@ -34,7 +34,32 @@ setup:
                                 x: "bbb"
 
     - match: { hits.hits.0.fields.bar.0: "aaabbb"}
+---
+"Scripted Field Doing Compare":
+    - do:
+        search:
+            body:
+                script_fields:
+                    bar:
+                        script:
+                            inline: "boolean compare(Supplier s, def v) {return s.get() == v;}
+                                     compare(() -> { return doc['foo'].value }, params.x);"
+                            params:
+                                x: "aaa"
 
+    - match: { hits.hits.0.fields.bar.0: true}
+    - do:
+        search:
+            body:
+                script_fields:
+                    bar:
+                        script:
+                            inline: "boolean compare(Supplier s, def v) {return s.get() == v;}
+                                     compare(() -> { return doc['foo'].value }, params.x);"
+                            params:
+                                x: "bbb"
+
+    - match: { hits.hits.0.fields.bar.0: false}
 ---
 "Scripted Field with a null safe dereference (non-null)":
     - do:
@@ -43,7 +68,7 @@ setup:
                 script_fields:
                     bar:
                         script:
-                            inline: "doc['foo'].value?.length() + params.x;"
+                            inline: "(doc['foo'].value?.length() ?: 0) + params.x;"
                             params:
                                 x: 5
 
@@ -58,7 +83,7 @@ setup:
                 script_fields:
                     bar:
                         script:
-                            inline: "(doc['missing'].value?.length() == null ? 0 : doc['missing'].value?.length()) + params.x;"
+                            inline: "(doc['missing'].value?.length() ?: 0) + params.x;"
                             params:
                                 x: 5
 
diff --git a/modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpRequestHandler.java b/modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpRequestHandler.java
index a4402d4816f..6e12970c6df 100644
--- a/modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpRequestHandler.java
+++ b/modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpRequestHandler.java
@@ -27,6 +27,7 @@ import io.netty.handler.codec.http.DefaultFullHttpRequest;
 import io.netty.handler.codec.http.FullHttpRequest;
 import org.elasticsearch.common.util.concurrent.ThreadContext;
 import org.elasticsearch.http.netty4.pipelining.HttpPipelinedRequest;
+import org.elasticsearch.transport.netty4.Netty4Utils;
 
 @ChannelHandler.Sharable
 class Netty4HttpRequestHandler extends SimpleChannelInboundHandler<Object> {
@@ -72,6 +73,7 @@ class Netty4HttpRequestHandler extends SimpleChannelInboundHandler<Object> {
 
     @Override
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+        Netty4Utils.maybeDie(cause);
         serverTransport.exceptionCaught(ctx, cause);
     }
 
diff --git a/modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpServerTransport.java b/modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpServerTransport.java
index 20cdfe0a128..90ca1b9a6a5 100644
--- a/modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpServerTransport.java
+++ b/modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpServerTransport.java
@@ -53,9 +53,9 @@ import org.elasticsearch.common.settings.Setting;
 import org.elasticsearch.common.settings.Setting.Property;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.BoundTransportAddress;
-import org.elasticsearch.common.transport.TransportAddress;
 import org.elasticsearch.common.transport.NetworkExceptionHelper;
 import org.elasticsearch.common.transport.PortsRange;
+import org.elasticsearch.common.transport.TransportAddress;
 import org.elasticsearch.common.unit.ByteSizeUnit;
 import org.elasticsearch.common.unit.ByteSizeValue;
 import org.elasticsearch.common.util.BigArrays;
@@ -578,6 +578,12 @@ public class Netty4HttpServerTransport extends AbstractLifecycleComponent implem
             ch.pipeline().addLast("handler", requestHandler);
         }
 
+        @Override
+        public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+            Netty4Utils.maybeDie(cause);
+            super.exceptionCaught(ctx, cause);
+        }
+
     }
 
 }
diff --git a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/ByteBufStreamInput.java b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/ByteBufStreamInput.java
index 2219ce31ff6..45aa029b46f 100644
--- a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/ByteBufStreamInput.java
+++ b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/ByteBufStreamInput.java
@@ -24,6 +24,7 @@ import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.stream.StreamInput;
 
+import java.io.EOFException;
 import java.io.IOException;
 
 /**
@@ -67,6 +68,14 @@ class ByteBufStreamInput extends StreamInput {
         return endIndex - buffer.readerIndex();
     }
 
+    @Override
+    protected void ensureCanReadBytes(int length) throws EOFException {
+        int bytesAvailable = endIndex - buffer.readerIndex();
+        if (bytesAvailable < length) {
+            throw new EOFException("tried to read: " + length + " bytes but only " + bytesAvailable + " remaining");
+        }
+    }
+
     @Override
     public void mark(int readlimit) {
         buffer.markReaderIndex();
diff --git a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4MessageChannelHandler.java b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4MessageChannelHandler.java
index cddbdac3e76..9741266a485 100644
--- a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4MessageChannelHandler.java
+++ b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4MessageChannelHandler.java
@@ -80,6 +80,7 @@ final class Netty4MessageChannelHandler extends ChannelDuplexHandler {
 
     @Override
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+        Netty4Utils.maybeDie(cause);
         transport.exceptionCaught(ctx, cause);
     }
 
diff --git a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Transport.java b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Transport.java
index 77429788317..bb84c47dc17 100644
--- a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Transport.java
+++ b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Transport.java
@@ -508,6 +508,12 @@ public class Netty4Transport extends TcpTransport<Channel> {
             ch.pipeline().addLast("dispatcher", new Netty4MessageChannelHandler(Netty4Transport.this, ".client"));
         }
 
+        @Override
+        public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+            Netty4Utils.maybeDie(cause);
+            super.exceptionCaught(ctx, cause);
+        }
+
     }
 
     protected class ServerChannelInitializer extends ChannelInitializer<Channel> {
@@ -526,6 +532,13 @@ public class Netty4Transport extends TcpTransport<Channel> {
             ch.pipeline().addLast("size", new Netty4SizeHeaderFrameDecoder());
             ch.pipeline().addLast("dispatcher", new Netty4MessageChannelHandler(Netty4Transport.this, name));
         }
+
+        @Override
+        public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+            Netty4Utils.maybeDie(cause);
+            super.exceptionCaught(ctx, cause);
+        }
+
     }
 
 }
diff --git a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Utils.java b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Utils.java
index 877d50e1674..774ac596382 100644
--- a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Utils.java
+++ b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Utils.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.elasticsearch.transport.netty4;
 
 import io.netty.buffer.ByteBuf;
@@ -28,9 +29,13 @@ import io.netty.util.internal.logging.InternalLoggerFactory;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.BytesRefIterator;
 import org.elasticsearch.common.bytes.BytesReference;
+import org.elasticsearch.common.logging.ESLoggerFactory;
 
 import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
@@ -63,8 +68,7 @@ public class Netty4Utils {
             return ((ByteBufBytesReference) reference).toByteBuf();
         } else {
             final BytesRefIterator iterator = reference.iterator();
-            // usually we have one, two, or three components
-            // from the header, the message, and a buffer
+            // usually we have one, two, or three components from the header, the message, and a buffer
             final List<ByteBuf> buffers = new ArrayList<>(3);
             try {
                 BytesRef slice;
@@ -118,4 +122,31 @@ public class Netty4Utils {
         }
     }
 
+    public static void maybeDie(final Throwable cause) throws IOException {
+        if (cause instanceof Error) {
+            /*
+             * Here be dragons. We want to rethrow this so that it bubbles up to the uncaught exception handler. Yet, Netty wraps too many
+             * invocations of user-code in try/catch blocks that swallow all throwables. This means that a rethrow here will not bubble up
+             * to where we want it to. So, we fork a thread and throw the exception from there where Netty can not get to it. We do not wrap
+             * the exception so as to not lose the original cause during exit, so we give the thread a name based on the previous stack
+             * frame so that at least we know where it came from (in case logging the current stack trace fails).
+             */
+            try (
+                final StringWriter sw = new StringWriter();
+                final PrintWriter pw = new PrintWriter(sw)) {
+                // try to log the current stack trace
+                Arrays.stream(Thread.currentThread().getStackTrace()).skip(1).map(e -> "\tat " + e).forEach(pw::println);
+                ESLoggerFactory.getLogger(Netty4Utils.class).error("fatal error on the network layer\n{}", sw.toString());
+            } finally {
+                final StackTraceElement previous = Thread.currentThread().getStackTrace()[2];
+                new Thread(
+                    () -> {
+                        throw (Error) cause;
+                    },
+                    previous.getClassName() + "#" + previous.getMethodName())
+                    .start();
+            }
+        }
+    }
+
 }
diff --git a/modules/transport-netty4/src/test/java/org/elasticsearch/http/netty4/Netty4HttpClient.java b/modules/transport-netty4/src/test/java/org/elasticsearch/http/netty4/Netty4HttpClient.java
index f6d3e1fe64f..ad1fedc49b0 100644
--- a/modules/transport-netty4/src/test/java/org/elasticsearch/http/netty4/Netty4HttpClient.java
+++ b/modules/transport-netty4/src/test/java/org/elasticsearch/http/netty4/Netty4HttpClient.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.elasticsearch.http.netty4;
 
 import io.netty.bootstrap.Bootstrap;
diff --git a/plugins/ingest-attachment/build.gradle b/plugins/ingest-attachment/build.gradle
index f22e0fdfeae..c80a8a1db59 100644
--- a/plugins/ingest-attachment/build.gradle
+++ b/plugins/ingest-attachment/build.gradle
@@ -23,7 +23,7 @@ esplugin {
 }
 
 versions << [
-  'tika': '1.13',
+  'tika': '1.14',
   'pdfbox': '2.0.3',
   'bouncycastle': '1.55',
   'poi': '3.15'
@@ -526,7 +526,9 @@ thirdPartyAudit.excludes = [
   'org.apache.http.StatusLine',
   'org.apache.http.client.HttpClient',
   'org.apache.http.client.methods.HttpGet',
+  'org.apache.http.client.methods.HttpPost',
   'org.apache.http.client.utils.URIBuilder',
+  'org.apache.http.entity.ByteArrayEntity',
   'org.apache.http.impl.client.DefaultHttpClient',
   'org.apache.james.mime4j.MimeException',
   'org.apache.james.mime4j.codec.DecodeMonitor',
diff --git a/plugins/ingest-attachment/licenses/tika-core-1.13.jar.sha1 b/plugins/ingest-attachment/licenses/tika-core-1.13.jar.sha1
deleted file mode 100644
index cfc36a450bd..00000000000
--- a/plugins/ingest-attachment/licenses/tika-core-1.13.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1305c798d41d1d7bbf12cb7c0ca184c98eed25ad
\ No newline at end of file
diff --git a/plugins/ingest-attachment/licenses/tika-core-1.14.jar.sha1 b/plugins/ingest-attachment/licenses/tika-core-1.14.jar.sha1
new file mode 100644
index 00000000000..2da2c07d9b2
--- /dev/null
+++ b/plugins/ingest-attachment/licenses/tika-core-1.14.jar.sha1
@@ -0,0 +1 @@
+afff8f1774994aa973ef90bc8d38ddf089b9d6d9
\ No newline at end of file
diff --git a/plugins/ingest-attachment/licenses/tika-parsers-1.13.jar.sha1 b/plugins/ingest-attachment/licenses/tika-parsers-1.13.jar.sha1
deleted file mode 100644
index 7fb2755d545..00000000000
--- a/plugins/ingest-attachment/licenses/tika-parsers-1.13.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-374fde67b9d35f785534b0e6c4953533c31bab5f
\ No newline at end of file
diff --git a/plugins/ingest-attachment/licenses/tika-parsers-1.14.jar.sha1 b/plugins/ingest-attachment/licenses/tika-parsers-1.14.jar.sha1
new file mode 100644
index 00000000000..b96b3cdefdd
--- /dev/null
+++ b/plugins/ingest-attachment/licenses/tika-parsers-1.14.jar.sha1
@@ -0,0 +1 @@
+d26c10a9e7d116366562aa260013a30a55ff4e8f
\ No newline at end of file
diff --git a/plugins/lang-javascript/build.gradle b/plugins/lang-javascript/build.gradle
deleted file mode 100644
index 13204e1d5d7..00000000000
--- a/plugins/lang-javascript/build.gradle
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-esplugin {
-  description 'The JavaScript language plugin allows to have javascript as the language of scripts to execute.'
-  classname 'org.elasticsearch.plugin.javascript.JavaScriptPlugin'
-}
-
-dependencies {
-  compile 'org.mozilla:rhino:1.7.7'
-}
-
-integTest {
-  cluster {
-    setting 'script.inline', 'true'
-    setting 'script.stored', 'true'
-    setting 'script.max_compilations_per_minute', '1000'
-  }
-}
diff --git a/plugins/lang-javascript/licenses/rhino-1.7.7.jar.sha1 b/plugins/lang-javascript/licenses/rhino-1.7.7.jar.sha1
deleted file mode 100644
index 8c997d41c2b..00000000000
--- a/plugins/lang-javascript/licenses/rhino-1.7.7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3a9ea863b86126b0ed8f2fe2230412747cd3c254
\ No newline at end of file
diff --git a/plugins/lang-javascript/licenses/rhino-LICENSE.txt b/plugins/lang-javascript/licenses/rhino-LICENSE.txt
deleted file mode 100644
index c0e7c21fbff..00000000000
--- a/plugins/lang-javascript/licenses/rhino-LICENSE.txt
+++ /dev/null
@@ -1,375 +0,0 @@
-The majority of Rhino is licensed under the MPL 2.0:
-
-Mozilla Public License Version 2.0
-==================================
-
-1. Definitions
---------------
-
-1.1. "Contributor"
-    means each individual or legal entity that creates, contributes to
-    the creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
-    means the combination of the Contributions of others (if any) used
-    by a Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
-    means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
-    means Source Code Form to which the initial Contributor has attached
-    the notice in Exhibit A, the Executable Form of such Source Code
-    Form, and Modifications of such Source Code Form, in each case
-    including portions thereof.
-
-1.5. "Incompatible With Secondary Licenses"
-    means
-
-    (a) that the initial Contributor has attached the notice described
-        in Exhibit B to the Covered Software; or
-
-    (b) that the Covered Software was made available under the terms of
-        version 1.1 or earlier of the License, but not also under the
-        terms of a Secondary License.
-
-1.6. "Executable Form"
-    means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
-    means a work that combines Covered Software with other material, in 
-    a separate file or files, that is not Covered Software.
-
-1.8. "License"
-    means this document.
-
-1.9. "Licensable"
-    means having the right to grant, to the maximum extent possible,
-    whether at the time of the initial grant or subsequently, any and
-    all of the rights conveyed by this License.
-
-1.10. "Modifications"
-    means any of the following:
-
-    (a) any file in Source Code Form that results from an addition to,
-        deletion from, or modification of the contents of Covered
-        Software; or
-
-    (b) any new file in Source Code Form that contains any Covered
-        Software.
-
-1.11. "Patent Claims" of a Contributor
-    means any patent claim(s), including without limitation, method,
-    process, and apparatus claims, in any patent Licensable by such
-    Contributor that would be infringed, but for the grant of the
-    License, by the making, using, selling, offering for sale, having
-    made, import, or transfer of either its Contributions or its
-    Contributor Version.
-
-1.12. "Secondary License"
-    means either the GNU General Public License, Version 2.0, the GNU
-    Lesser General Public License, Version 2.1, the GNU Affero General
-    Public License, Version 3.0, or any later versions of those
-    licenses.
-
-1.13. "Source Code Form"
-    means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
-    means an individual or a legal entity exercising rights under this
-    License. For legal entities, "You" includes any entity that
-    controls, is controlled by, or is under common control with You. For
-    purposes of this definition, "control" means (a) the power, direct
-    or indirect, to cause the direction or management of such entity,
-    whether by contract or otherwise, or (b) ownership of more than
-    fifty percent (50%) of the outstanding shares or beneficial
-    ownership of such entity.
-
-2. License Grants and Conditions
---------------------------------
-
-2.1. Grants
-
-Each Contributor hereby grants You a world-wide, royalty-free,
-non-exclusive license:
-
-(a) under intellectual property rights (other than patent or trademark)
-    Licensable by such Contributor to use, reproduce, make available,
-    modify, display, perform, distribute, and otherwise exploit its
-    Contributions, either on an unmodified basis, with Modifications, or
-    as part of a Larger Work; and
-
-(b) under Patent Claims of such Contributor to make, use, sell, offer
-    for sale, have made, import, and otherwise transfer either its
-    Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-The licenses granted in Section 2.1 with respect to any Contribution
-become effective for each Contribution on the date the Contributor first
-distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-The licenses granted in this Section 2 are the only rights granted under
-this License. No additional rights or licenses will be implied from the
-distribution or licensing of Covered Software under this License.
-Notwithstanding Section 2.1(b) above, no patent license is granted by a
-Contributor:
-
-(a) for any code that a Contributor has removed from Covered Software;
-    or
-
-(b) for infringements caused by: (i) Your and any other third party's
-    modifications of Covered Software, or (ii) the combination of its
-    Contributions with other software (except as part of its Contributor
-    Version); or
-
-(c) under Patent Claims infringed by Covered Software in the absence of
-    its Contributions.
-
-This License does not grant any rights in the trademarks, service marks,
-or logos of any Contributor (except as may be necessary to comply with
-the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to
-distribute the Covered Software under a subsequent version of this
-License (see Section 10.2) or under the terms of a Secondary License (if
-permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-Each Contributor represents that the Contributor believes its
-Contributions are its original creation(s) or it has sufficient rights
-to grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-This License is not intended to limit any rights You have under
-applicable copyright doctrines of fair use, fair dealing, or other
-equivalents.
-
-2.7. Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
-in Section 2.1.
-
-3. Responsibilities
--------------------
-
-3.1. Distribution of Source Form
-
-All distribution of Covered Software in Source Code Form, including any
-Modifications that You create or to which You contribute, must be under
-the terms of this License. You must inform recipients that the Source
-Code Form of the Covered Software is governed by the terms of this
-License, and how they can obtain a copy of this License. You may not
-attempt to alter or restrict the recipients' rights in the Source Code
-Form.
-
-3.2. Distribution of Executable Form
-
-If You distribute Covered Software in Executable Form then:
-
-(a) such Covered Software must also be made available in Source Code
-    Form, as described in Section 3.1, and You must inform recipients of
-    the Executable Form how they can obtain a copy of such Source Code
-    Form by reasonable means in a timely manner, at a charge no more
-    than the cost of distribution to the recipient; and
-
-(b) You may distribute such Executable Form under the terms of this
-    License, or sublicense it under different terms, provided that the
-    license for the Executable Form does not attempt to limit or alter
-    the recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice,
-provided that You also comply with the requirements of this License for
-the Covered Software. If the Larger Work is a combination of Covered
-Software with a work governed by one or more Secondary Licenses, and the
-Covered Software is not Incompatible With Secondary Licenses, this
-License permits You to additionally distribute such Covered Software
-under the terms of such Secondary License(s), so that the recipient of
-the Larger Work may, at their option, further distribute the Covered
-Software under the terms of either this License or such Secondary
-License(s).
-
-3.4. Notices
-
-You may not remove or alter the substance of any license notices
-(including copyright notices, patent notices, disclaimers of warranty,
-or limitations of liability) contained within the Source Code Form of
-the Covered Software, except that You may alter any license notices to
-the extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-You may choose to offer, and to charge a fee for, warranty, support,
-indemnity or liability obligations to one or more recipients of Covered
-Software. However, You may do so only on Your own behalf, and not on
-behalf of any Contributor. You must make it absolutely clear that any
-such warranty, support, indemnity, or liability obligation is offered by
-You alone, and You hereby agree to indemnify every Contributor for any
-liability incurred by such Contributor as a result of warranty, support,
-indemnity or liability terms You offer. You may include additional
-disclaimers of warranty and limitations of liability specific to any
-jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
----------------------------------------------------
-
-If it is impossible for You to comply with any of the terms of this
-License with respect to some or all of the Covered Software due to
-statute, judicial order, or regulation then You must: (a) comply with
-the terms of this License to the maximum extent possible; and (b)
-describe the limitations and the code they affect. Such description must
-be placed in a text file included with all distributions of the Covered
-Software under this License. Except to the extent prohibited by statute
-or regulation, such description must be sufficiently detailed for a
-recipient of ordinary skill to be able to understand it.
-
-5. Termination
---------------
-
-5.1. The rights granted under this License will terminate automatically
-if You fail to comply with any of its terms. However, if You become
-compliant, then the rights granted under this License from a particular
-Contributor are reinstated (a) provisionally, unless and until such
-Contributor explicitly and finally terminates Your grants, and (b) on an
-ongoing basis, if such Contributor fails to notify You of the
-non-compliance by some reasonable means prior to 60 days after You have
-come back into compliance. Moreover, Your grants from a particular
-Contributor are reinstated on an ongoing basis if such Contributor
-notifies You of the non-compliance by some reasonable means, this is the
-first time You have received notice of non-compliance with this License
-from such Contributor, and You become compliant prior to 30 days after
-Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-infringement claim (excluding declaratory judgment actions,
-counter-claims, and cross-claims) alleging that a Contributor Version
-directly or indirectly infringes any patent, then the rights granted to
-You by any and all Contributors for the Covered Software under Section
-2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all
-end user license agreements (excluding distributors and resellers) which
-have been validly granted by You or Your distributors under this License
-prior to termination shall survive termination.
-
-************************************************************************
-*                                                                      *
-*  6. Disclaimer of Warranty                                           *
-*  -------------------------                                           *
-*                                                                      *
-*  Covered Software is provided under this License on an "as is"       *
-*  basis, without warranty of any kind, either expressed, implied, or  *
-*  statutory, including, without limitation, warranties that the       *
-*  Covered Software is free of defects, merchantable, fit for a        *
-*  particular purpose or non-infringing. The entire risk as to the     *
-*  quality and performance of the Covered Software is with You.        *
-*  Should any Covered Software prove defective in any respect, You     *
-*  (not any Contributor) assume the cost of any necessary servicing,   *
-*  repair, or correction. This disclaimer of warranty constitutes an   *
-*  essential part of this License. No use of any Covered Software is   *
-*  authorized under this License except under this disclaimer.         *
-*                                                                      *
-************************************************************************
-
-************************************************************************
-*                                                                      *
-*  7. Limitation of Liability                                          *
-*  --------------------------                                          *
-*                                                                      *
-*  Under no circumstances and under no legal theory, whether tort      *
-*  (including negligence), contract, or otherwise, shall any           *
-*  Contributor, or anyone who distributes Covered Software as          *
-*  permitted above, be liable to You for any direct, indirect,         *
-*  special, incidental, or consequential damages of any character      *
-*  including, without limitation, damages for lost profits, loss of    *
-*  goodwill, work stoppage, computer failure or malfunction, or any    *
-*  and all other commercial damages or losses, even if such party      *
-*  shall have been informed of the possibility of such damages. This   *
-*  limitation of liability shall not apply to liability for death or   *
-*  personal injury resulting from such party's negligence to the       *
-*  extent applicable law prohibits such limitation. Some               *
-*  jurisdictions do not allow the exclusion or limitation of           *
-*  incidental or consequential damages, so this exclusion and          *
-*  limitation may not apply to You.                                    *
-*                                                                      *
-************************************************************************
-
-8. Litigation
--------------
-
-Any litigation relating to this License may be brought only in the
-courts of a jurisdiction where the defendant maintains its principal
-place of business and such litigation shall be governed by laws of that
-jurisdiction, without reference to its conflict-of-law provisions.
-Nothing in this Section shall prevent a party's ability to bring
-cross-claims or counter-claims.
-
-9. Miscellaneous
-----------------
-
-This License represents the complete agreement concerning the subject
-matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed only to the extent
-necessary to make it enforceable. Any law or regulation which provides
-that the language of a contract shall be construed against the drafter
-shall not be used to construe this License against a Contributor.
-
-10. Versions of the License
----------------------------
-
-10.1. New Versions
-
-Mozilla Foundation is the license steward. Except as provided in Section
-10.3, no one other than the license steward has the right to modify or
-publish new versions of this License. Each version will be given a
-distinguishing version number.
-
-10.2. Effect of New Versions
-
-You may distribute the Covered Software under the terms of the version
-of the License under which You originally received the Covered Software,
-or under the terms of any subsequent version published by the license
-steward.
-
-10.3. Modified Versions
-
-If you create software not governed by this License, and you want to
-create a new license for such software, you may create and use a
-modified version of this License if you rename the license and remove
-any references to the name of the license steward (except to note that
-such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-Licenses
-
-If You choose to distribute Source Code Form that is Incompatible With
-Secondary Licenses under the terms of this version of the License, the
-notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
--------------------------------------------
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular
-file, then You may include the notice in a location (such as a LICENSE
-file in a relevant directory) where a recipient would be likely to look
-for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
----------------------------------------------------------
-
-  This Source Code Form is "Incompatible With Secondary Licenses", as
-  defined by the Mozilla Public License, v. 2.0.
diff --git a/plugins/lang-javascript/licenses/rhino-NOTICE.txt b/plugins/lang-javascript/licenses/rhino-NOTICE.txt
deleted file mode 100644
index afe1503d842..00000000000
--- a/plugins/lang-javascript/licenses/rhino-NOTICE.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-Rhino is licensed subject to the terms of the Mozilla Public License, v. 2.0.
-See "License.txt" for the text of the license.
-
-Rhino contains the following additional software:
-
-----
-
-Portions of the floating-point conversion code, and portions of the test suite
-come from the Google V8 JavaScript engine and are subject to the following:
-
-Copyright 2010-2015 the V8 project authors. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google Inc. nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/plugins/lang-javascript/src/main/java/org/elasticsearch/plugin/javascript/JavaScriptPlugin.java b/plugins/lang-javascript/src/main/java/org/elasticsearch/plugin/javascript/JavaScriptPlugin.java
deleted file mode 100644
index 4baeb71652d..00000000000
--- a/plugins/lang-javascript/src/main/java/org/elasticsearch/plugin/javascript/JavaScriptPlugin.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.plugin.javascript;
-
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.plugins.Plugin;
-import org.elasticsearch.plugins.ScriptPlugin;
-import org.elasticsearch.script.ScriptEngineRegistry;
-import org.elasticsearch.script.ScriptEngineService;
-import org.elasticsearch.script.ScriptModule;
-import org.elasticsearch.script.javascript.JavaScriptScriptEngineService;
-
-public class JavaScriptPlugin extends Plugin implements ScriptPlugin {
-
-    static {
-        // install rhino policy on plugin init
-        JavaScriptScriptEngineService.init();
-    }
-
-    @Override
-    public ScriptEngineService getScriptEngineService(Settings settings) {
-        return new JavaScriptScriptEngineService(settings);
-    }
-}
diff --git a/plugins/lang-javascript/src/main/java/org/elasticsearch/script/javascript/JavaScriptScriptEngineService.java b/plugins/lang-javascript/src/main/java/org/elasticsearch/script/javascript/JavaScriptScriptEngineService.java
deleted file mode 100644
index 6af04561e4b..00000000000
--- a/plugins/lang-javascript/src/main/java/org/elasticsearch/script/javascript/JavaScriptScriptEngineService.java
+++ /dev/null
@@ -1,355 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.script.javascript;
-
-import org.apache.lucene.index.LeafReaderContext;
-import org.apache.lucene.search.Scorer;
-import org.elasticsearch.SpecialPermission;
-import org.elasticsearch.bootstrap.BootstrapInfo;
-import org.elasticsearch.common.Nullable;
-import org.elasticsearch.common.component.AbstractComponent;
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.script.ClassPermission;
-import org.elasticsearch.script.CompiledScript;
-import org.elasticsearch.script.ExecutableScript;
-import org.elasticsearch.script.LeafSearchScript;
-import org.elasticsearch.script.ScoreAccessor;
-import org.elasticsearch.script.ScriptEngineService;
-import org.elasticsearch.script.SearchScript;
-import org.elasticsearch.script.javascript.support.NativeList;
-import org.elasticsearch.script.javascript.support.NativeMap;
-import org.elasticsearch.script.javascript.support.ScriptValueConverter;
-import org.elasticsearch.search.lookup.LeafSearchLookup;
-import org.elasticsearch.search.lookup.SearchLookup;
-import org.mozilla.javascript.Context;
-import org.mozilla.javascript.ContextFactory;
-import org.mozilla.javascript.GeneratedClassLoader;
-import org.mozilla.javascript.PolicySecurityController;
-import org.mozilla.javascript.Script;
-import org.mozilla.javascript.Scriptable;
-import org.mozilla.javascript.ScriptableObject;
-import org.mozilla.javascript.SecurityController;
-import org.mozilla.javascript.WrapFactory;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.CodeSource;
-import java.security.PrivilegedAction;
-import java.security.cert.Certificate;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicLong;
-
-public class JavaScriptScriptEngineService extends AbstractComponent implements ScriptEngineService {
-
-    public static final String NAME = "javascript";
-
-    public static final String EXTENSION = "js";
-
-    private final AtomicLong counter = new AtomicLong();
-
-    private static WrapFactory wrapFactory = new CustomWrapFactory();
-
-    private Scriptable globalScope;
-
-    // one time initialization of rhino security manager integration
-    private static final CodeSource DOMAIN;
-    private static final int OPTIMIZATION_LEVEL = 1;
-
-    static {
-        try {
-            DOMAIN = new CodeSource(new URL("file:" + BootstrapInfo.UNTRUSTED_CODEBASE), (Certificate[]) null);
-        } catch (MalformedURLException e) {
-            throw new RuntimeException(e);
-        }
-        ContextFactory factory = new ContextFactory() {
-            @Override
-            protected void onContextCreated(Context cx) {
-                cx.setWrapFactory(wrapFactory);
-                cx.setOptimizationLevel(OPTIMIZATION_LEVEL);
-            }
-        };
-        if (System.getSecurityManager() != null) {
-            factory.initApplicationClassLoader(AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
-                @Override
-                public ClassLoader run() {
-                    // snapshot our context (which has permissions for classes), since the script has none
-                    final AccessControlContext engineContext = AccessController.getContext();
-                    return new ClassLoader(JavaScriptScriptEngineService.class.getClassLoader()) {
-                        @Override
-                        protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
-                            try {
-                                engineContext.checkPermission(new ClassPermission(name));
-                            } catch (SecurityException e) {
-                                throw new ClassNotFoundException(name, e);
-                            }
-                            return super.loadClass(name, resolve);
-                        }
-                    };
-                }
-            }));
-        }
-        factory.seal();
-        ContextFactory.initGlobal(factory);
-        SecurityController.initGlobal(new PolicySecurityController() {
-            @Override
-            public GeneratedClassLoader createClassLoader(ClassLoader parent, Object securityDomain) {
-                // don't let scripts compile other scripts
-                SecurityManager sm = System.getSecurityManager();
-                if (sm != null) {
-                    sm.checkPermission(new SpecialPermission());
-                }
-                // check the domain, this is all we allow
-                if (securityDomain != DOMAIN) {
-                    throw new SecurityException("illegal securityDomain: " + securityDomain);
-                }
-
-                return super.createClassLoader(parent, securityDomain);
-            }
-        });
-    }
-
-    /** ensures this engine is initialized */
-    public static void init() {}
-
-    public JavaScriptScriptEngineService(Settings settings) {
-        super(settings);
-
-        deprecationLogger.deprecated("[javascript] scripts are deprecated, use [painless] scripts instead");
-
-        Context ctx = Context.enter();
-        try {
-            globalScope = ctx.initStandardObjects(null, true);
-        } finally {
-            Context.exit();
-        }
-    }
-
-    @Override
-    public void close() {
-        // Nothing to do here
-    }
-
-    @Override
-    public String getType() {
-        return NAME;
-    }
-
-    @Override
-    public String getExtension() {
-        return EXTENSION;
-    }
-
-    @Override
-    public Object compile(String scriptName, String scriptSource, Map<String, String> params) {
-        Context ctx = Context.enter();
-        try {
-            return ctx.compileString(scriptSource, generateScriptName(), 1, DOMAIN);
-        } finally {
-            Context.exit();
-        }
-    }
-
-    @Override
-    public ExecutableScript executable(CompiledScript compiledScript, @Nullable Map<String, Object> vars) {
-        deprecationLogger.deprecated("[javascript] scripts are deprecated, use [painless] scripts instead");
-
-        Context ctx = Context.enter();
-        try {
-            Scriptable scope = ctx.newObject(globalScope);
-            scope.setPrototype(globalScope);
-            scope.setParentScope(null);
-            if (vars != null) {
-                for (Map.Entry<String, Object> entry : vars.entrySet()) {
-                    ScriptableObject.putProperty(scope, entry.getKey(), entry.getValue());
-                }
-            }
-
-            return new JavaScriptExecutableScript((Script) compiledScript.compiled(), scope);
-        } finally {
-            Context.exit();
-        }
-    }
-
-    @Override
-    public SearchScript search(final CompiledScript compiledScript, final SearchLookup lookup, @Nullable final Map<String, Object> vars) {
-        deprecationLogger.deprecated("[javascript] scripts are deprecated, use [painless] scripts instead");
-
-        Context ctx = Context.enter();
-        try {
-            final Scriptable scope = ctx.newObject(globalScope);
-            scope.setPrototype(globalScope);
-            scope.setParentScope(null);
-
-            return new SearchScript() {
-
-              @Override
-              public LeafSearchScript getLeafSearchScript(LeafReaderContext context) throws IOException {
-                final LeafSearchLookup leafLookup = lookup.getLeafSearchLookup(context);
-                for (Map.Entry<String, Object> entry : leafLookup.asMap().entrySet()) {
-                    ScriptableObject.putProperty(scope, entry.getKey(), entry.getValue());
-                }
-
-                if (vars != null) {
-                    for (Map.Entry<String, Object> entry : vars.entrySet()) {
-                        ScriptableObject.putProperty(scope, entry.getKey(), entry.getValue());
-                    }
-                }
-
-                return new JavaScriptSearchScript((Script) compiledScript.compiled(), scope, leafLookup);
-              }
-
-              @Override
-              public boolean needsScores() {
-                  // TODO: can we reliably know if a javascript script makes use of _score
-                  return true;
-              }
-            };
-        } finally {
-            Context.exit();
-        }
-    }
-
-    private String generateScriptName() {
-        return "Script" + counter.incrementAndGet() + ".js";
-    }
-
-    public static class JavaScriptExecutableScript implements ExecutableScript {
-
-        private final Script script;
-
-        private final Scriptable scope;
-
-        public JavaScriptExecutableScript(Script script, Scriptable scope) {
-            this.script = script;
-            this.scope = scope;
-        }
-
-        @Override
-        public Object run() {
-            Context ctx = Context.enter();
-            try {
-                return ScriptValueConverter.unwrapValue(script.exec(ctx, scope));
-            } finally {
-                Context.exit();
-            }
-        }
-
-        @Override
-        public void setNextVar(String name, Object value) {
-            ScriptableObject.putProperty(scope, name, value);
-        }
-
-        @Override
-        public Object unwrap(Object value) {
-            return ScriptValueConverter.unwrapValue(value);
-        }
-    }
-
-    public static class JavaScriptSearchScript implements LeafSearchScript {
-
-        private final Script script;
-
-        private final Scriptable scope;
-
-        private final LeafSearchLookup lookup;
-
-        public JavaScriptSearchScript(Script script, Scriptable scope, LeafSearchLookup lookup) {
-            this.script = script;
-            this.scope = scope;
-            this.lookup = lookup;
-        }
-
-        @Override
-        public void setScorer(Scorer scorer) {
-            Context ctx = Context.enter();
-            try {
-              ScriptableObject.putProperty(scope, "_score", wrapFactory.wrapAsJavaObject(ctx, scope, new ScoreAccessor(scorer), ScoreAccessor.class));
-            } finally {
-              Context.exit();
-            }
-        }
-
-        @Override
-        public void setDocument(int doc) {
-            lookup.setDocument(doc);
-        }
-
-        @Override
-        public void setNextVar(String name, Object value) {
-            ScriptableObject.putProperty(scope, name, value);
-        }
-
-        @Override
-        public void setSource(Map<String, Object> source) {
-            lookup.source().setSource(source);
-        }
-
-        @Override
-        public Object run() {
-            Context ctx = Context.enter();
-            try {
-                return ScriptValueConverter.unwrapValue(script.exec(ctx, scope));
-            } finally {
-                Context.exit();
-            }
-        }
-
-        @Override
-        public long runAsLong() {
-            return ((Number) run()).longValue();
-        }
-
-        @Override
-        public double runAsDouble() {
-            return ((Number) run()).doubleValue();
-        }
-
-        @Override
-        public Object unwrap(Object value) {
-            return ScriptValueConverter.unwrapValue(value);
-        }
-    }
-
-    /**
-     * Wrap Factory for Rhino Script Engine
-     */
-    public static class CustomWrapFactory extends WrapFactory {
-
-        public CustomWrapFactory() {
-            setJavaPrimitiveWrap(false); // RingoJS does that..., claims its annoying...
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        public Scriptable wrapAsJavaObject(Context cx, Scriptable scope, Object javaObject, Class<?> staticType) {
-            if (javaObject instanceof Map) {
-                return NativeMap.wrap(scope, (Map<Object, Object>) javaObject);
-            }
-            if (javaObject instanceof List) {
-                return NativeList.wrap(scope, (List<Object>) javaObject, staticType);
-            }
-            return super.wrapAsJavaObject(cx, scope, javaObject, staticType);
-        }
-    }
-}
diff --git a/plugins/lang-javascript/src/main/java/org/elasticsearch/script/javascript/support/NativeList.java b/plugins/lang-javascript/src/main/java/org/elasticsearch/script/javascript/support/NativeList.java
deleted file mode 100644
index 4ef7f9177c5..00000000000
--- a/plugins/lang-javascript/src/main/java/org/elasticsearch/script/javascript/support/NativeList.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.script.javascript.support;
-
-import org.mozilla.javascript.NativeJavaObject;
-import org.mozilla.javascript.Scriptable;
-import org.mozilla.javascript.Undefined;
-import org.mozilla.javascript.Wrapper;
-
-import java.util.Arrays;
-import java.util.List;
-
-public class NativeList extends NativeJavaObject implements Scriptable, Wrapper {
-    private static final String LENGTH_PROPERTY = "length";
-
-    private final List<Object> list;
-
-
-    public static NativeList wrap(Scriptable scope, List<Object> list, Class<?> staticType) {
-        return new NativeList(scope, list, staticType);
-    }
-
-    private NativeList(Scriptable scope, List<Object> list, Class<?> staticType) {
-        super(scope, list, staticType);
-        this.list = list;
-    }
-
-    /* (non-Javadoc)
-     * @see org.mozilla.javascript.Wrapper#unwrap()
-     */
-
-    public Object unwrap() {
-        return list;
-    }
-
-    /* (non-Javadoc)
-     * @see org.mozilla.javascript.Scriptable#getClassName()
-     */
-
-    public String getClassName() {
-        return "NativeList";
-    }
-
-    /* (non-Javadoc)
-     * @see org.mozilla.javascript.Scriptable#get(java.lang.String, org.mozilla.javascript.Scriptable)
-     */
-
-    public Object get(String name, Scriptable start) {
-        if (LENGTH_PROPERTY.equals(name)) {
-            return list.size();
-        } else {
-            return super.get(name, start);
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see org.mozilla.javascript.Scriptable#get(int, org.mozilla.javascript.Scriptable)
-     */
-
-    public Object get(int index, Scriptable start) {
-        if (has(index, start) == false) {
-            return Undefined.instance;
-        }
-        return list.get(index);
-    }
-
-    /* (non-Javadoc)
-     * @see org.mozilla.javascript.Scriptable#has(java.lang.String, org.mozilla.javascript.Scriptable)
-     */
-
-    public boolean has(String name, Scriptable start) {
-        return super.has(name, start) || LENGTH_PROPERTY.equals(name);
-    }
-
-    /* (non-Javadoc)
-     * @see org.mozilla.javascript.Scriptable#has(int, org.mozilla.javascript.Scriptable)
-     */
-
-    public boolean has(int index, Scriptable start) {
-        return index >= 0 && index < list.size();
-    }
-
-    /* (non-Javadoc)
-     * @see org.mozilla.javascript.Scriptable#put(int, org.mozilla.javascript.Scriptable, java.lang.Object)
-     */
-
-    public void put(int index, Scriptable start, Object value) {
-        if (index == list.size()) {
-            list.add(value);
-        } else {
-            list.set(index, value);
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see org.mozilla.javascript.Scriptable#delete(int)
-     */
-
-    public void delete(int index) {
-        list.remove(index);
-    }
-
-    /* (non-Javadoc)
-     * @see org.mozilla.javascript.Scriptable#getIds()
-     */
-
-    public Object[] getIds() {
-        final Object[] javaObjectIds = super.getIds();
-        final int size = list.size();
-        final Object[] ids = Arrays.copyOf(javaObjectIds, javaObjectIds.length + size);
-        for (int i = 0; i < size; ++i) {
-            ids[javaObjectIds.length + i] = i;
-        }
-        return ids;
-    }
-
-    /* (non-Javadoc)
-     * @see org.mozilla.javascript.Scriptable#hasInstance(org.mozilla.javascript.Scriptable)
-     */
-
-    public boolean hasInstance(Scriptable value) {
-        if (!(value instanceof Wrapper))
-            return false;
-        Object instance = ((Wrapper) value).unwrap();
-        return List.class.isInstance(instance);
-    }
-
-}
diff --git a/plugins/lang-javascript/src/main/java/org/elasticsearch/script/javascript/support/NativeMap.java b/plugins/lang-javascript/src/main/java/org/elasticsearch/script/javascript/support/NativeMap.java
deleted file mode 100644
index 8d7373cb8a0..00000000000
--- a/plugins/lang-javascript/src/main/java/org/elasticsearch/script/javascript/support/NativeMap.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.script.javascript.support;
-
-import org.mozilla.javascript.Scriptable;
-import org.mozilla.javascript.Wrapper;
-
-import java.util.Iterator;
-import java.util.Map;
-
-/**
- * Wrapper for exposing maps in Rhino scripts.
- *
- *
- */
-public class NativeMap implements Scriptable, Wrapper {
-    private Map<Object, Object> map;
-    private Scriptable parentScope;
-    private Scriptable prototype;
-
-
-    /**
-     * Construct
-     *
-     * @return native map
-     */
-    public static NativeMap wrap(Scriptable scope, Map<Object, Object> map) {
-        return new NativeMap(scope, map);
-    }
-
-    /**
-     * Construct
-     */
-    private NativeMap(Scriptable scope, Map<Object, Object> map) {
-        this.parentScope = scope;
-        this.map = map;
-    }
-
-    @Override
-    public Object unwrap() {
-        return map;
-    }
-
-    @Override
-    public String getClassName() {
-        return "NativeMap";
-    }
-
-    @Override
-    public Object get(String name, Scriptable start) {
-        // get the property from the underlying QName map
-        if ("length".equals(name)) {
-            return map.size();
-        } else {
-            return map.get(name);
-        }
-    }
-
-    @Override
-    public Object get(int index, Scriptable start) {
-        Object value = null;
-        int i = 0;
-        Iterator<Object> itrValues = map.values().iterator();
-        while (i++ <= index && itrValues.hasNext()) {
-            value = itrValues.next();
-        }
-        return value;
-    }
-
-    @Override
-    public boolean has(String name, Scriptable start) {
-        // locate the property in the underlying map
-        return map.containsKey(name);
-    }
-
-    @Override
-    public boolean has(int index, Scriptable start) {
-        return (index >= 0 && map.values().size() > index);
-    }
-
-    @Override
-    public void put(String name, Scriptable start, Object value) {
-        map.put(name, value);
-    }
-
-    @Override
-    public void put(int index, Scriptable start, Object value) {
-        // TODO: implement?
-    }
-
-    @Override
-    public void delete(String name) {
-        map.remove(name);
-    }
-
-    @Override
-    public void delete(int index) {
-        int i = 0;
-        Iterator<Object> itrKeys = map.keySet().iterator();
-        while (i <= index && itrKeys.hasNext()) {
-            Object key = itrKeys.next();
-            if (i == index) {
-                map.remove(key);
-                break;
-            }
-        }
-    }
-
-    @Override
-    public Scriptable getPrototype() {
-        return this.prototype;
-    }
-
-    @Override
-    public void setPrototype(Scriptable prototype) {
-        this.prototype = prototype;
-    }
-
-    @Override
-    public Scriptable getParentScope() {
-        return this.parentScope;
-    }
-
-    @Override
-    public void setParentScope(Scriptable parent) {
-        this.parentScope = parent;
-    }
-
-    @Override
-    public Object[] getIds() {
-        return map.keySet().toArray();
-    }
-
-    @Override
-    public Object getDefaultValue(Class<?> hint) {
-        return null;
-    }
-
-    @Override
-    public boolean hasInstance(Scriptable value) {
-        if (!(value instanceof Wrapper))
-            return false;
-        Object instance = ((Wrapper) value).unwrap();
-        return Map.class.isInstance(instance);
-    }
-
-}
diff --git a/plugins/lang-javascript/src/main/java/org/elasticsearch/script/javascript/support/ScriptValueConverter.java b/plugins/lang-javascript/src/main/java/org/elasticsearch/script/javascript/support/ScriptValueConverter.java
deleted file mode 100644
index 111d2a22b87..00000000000
--- a/plugins/lang-javascript/src/main/java/org/elasticsearch/script/javascript/support/ScriptValueConverter.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.script.javascript.support;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.mozilla.javascript.Context;
-import org.mozilla.javascript.IdScriptableObject;
-import org.mozilla.javascript.NativeArray;
-import org.mozilla.javascript.ScriptRuntime;
-import org.mozilla.javascript.Scriptable;
-import org.mozilla.javascript.Wrapper;
-
-/**
- * Value Converter to marshal objects between Java and Javascript.
- *
- *
- */
-public final class ScriptValueConverter {
-    private static final String TYPE_DATE = "Date";
-
-
-    /**
-     * Private constructor - methods are static
-     */
-    private ScriptValueConverter() {
-    }
-
-    /**
-     * Convert an object from a script wrapper value to a serializable value valid outside
-     * of the Rhino script processor context.
-     * <p>
-     * This includes converting JavaScript Array objects to Lists of valid objects.
-     *
-     * @param value Value to convert from script wrapper object to external object value.
-     * @return unwrapped and converted value.
-     */
-    public static Object unwrapValue(Object value) {
-        if (value == null) {
-            return null;
-        } else if (value instanceof Wrapper) {
-            // unwrap a Java object from a JavaScript wrapper
-            // recursively call this method to convert the unwrapped value
-            value = unwrapValue(((Wrapper) value).unwrap());
-        } else if (value instanceof IdScriptableObject) {
-            // check for special case Native object wrappers
-            String className = ((IdScriptableObject) value).getClassName();
-            // check for special case of the String object
-            if ("String".equals(className)) {
-                value = Context.jsToJava(value, String.class);
-            }
-            // check for special case of a Date object
-            else if ("Date".equals(className)) {
-                value = Context.jsToJava(value, Date.class);
-            } else {
-                // a scriptable object will probably indicate a multi-value property set
-                // set using a JavaScript associative Array object
-                Scriptable values = (Scriptable) value;
-                Object[] propIds = values.getIds();
-
-                // is it a JavaScript associative Array object using Integer indexes?
-                if (values instanceof NativeArray && isArray(propIds)) {
-                    // convert JavaScript array of values to a List of Serializable objects
-                    List<Object> propValues = new ArrayList<Object>(propIds.length);
-                    for (int i = 0; i < propIds.length; i++) {
-                        // work on each key in turn
-                        Integer propId = (Integer) propIds[i];
-
-                        // we are only interested in keys that indicate a list of values
-                        if (propId instanceof Integer) {
-                            // get the value out for the specified key
-                            Object val = values.get(propId, values);
-                            // recursively call this method to convert the value
-                            propValues.add(unwrapValue(val));
-                        }
-                    }
-
-                    value = propValues;
-                } else {
-                    // any other JavaScript object that supports properties - convert to a Map of objects
-                    Map<String, Object> propValues = new HashMap<String, Object>(propIds.length);
-                    for (int i = 0; i < propIds.length; i++) {
-                        // work on each key in turn
-                        Object propId = propIds[i];
-
-                        // we are only interested in keys that indicate a list of values
-                        if (propId instanceof String) {
-                            // get the value out for the specified key
-                            Object val = values.get((String) propId, values);
-                            // recursively call this method to convert the value
-                            propValues.put((String) propId, unwrapValue(val));
-                        }
-                    }
-                    value = propValues;
-                }
-            }
-        } else if (value instanceof Object[]) {
-            // convert back a list Object Java values
-            Object[] array = (Object[]) value;
-            ArrayList<Object> list = new ArrayList<Object>(array.length);
-            for (int i = 0; i < array.length; i++) {
-                list.add(unwrapValue(array[i]));
-            }
-            value = list;
-        } else if (value instanceof Map) {
-            // ensure each value in the Map is unwrapped (which may have been an unwrapped NativeMap!)
-            @SuppressWarnings("unchecked")
-            Map<Object, Object> map = (Map<Object, Object>) value;
-            Map<Object, Object> copyMap = new HashMap<Object, Object>(map.size());
-            for (Object key : map.keySet()) {
-                copyMap.put(key, unwrapValue(map.get(key)));
-            }
-            value = copyMap;
-        }
-        return value;
-    }
-
-    /**
-     * Convert an object from any repository serialized value to a valid script object.
-     * This includes converting Collection multi-value properties into JavaScript Array objects.
-     *
-     * @param scope Scripting scope
-     * @param value Property value
-     * @return Value safe for scripting usage
-     */
-    public static Object wrapValue(Scriptable scope, Object value) {
-        // perform conversions from Java objects to JavaScript scriptable instances
-        if (value == null) {
-            return null;
-        } else if (value instanceof Date) {
-            // convert Date to JavaScript native Date object
-            // call the "Date" constructor on the root scope object - passing in the millisecond
-            // value from the Java date - this will construct a JavaScript Date with the same value
-            Date date = (Date) value;
-            value = ScriptRuntime.newObject(
-                    Context.getCurrentContext(), scope, TYPE_DATE, new Object[]{date.getTime()});
-        } else if (value instanceof Collection) {
-            // recursively convert each value in the collection
-            @SuppressWarnings("unchecked")
-            Collection<Object> collection = (Collection<Object>) value;
-            Object[] array = new Object[collection.size()];
-            int index = 0;
-            for (Object obj : collection) {
-                array[index++] = wrapValue(scope, obj);
-            }
-            // convert array to a native JavaScript Array
-            value = Context.getCurrentContext().newArray(scope, array);
-        } else if (value instanceof Map) {
-            @SuppressWarnings("unchecked")
-            Map<Object, Object> map = (Map<Object, Object>) value;
-            value = NativeMap.wrap(scope, map);
-        }
-
-        // simple numbers, strings and booleans are wrapped automatically by Rhino
-
-        return value;
-    }
-
-    /**
-     * Look at the id's of a native array and try to determine whether it's actually an Array or a Hashmap
-     *
-     * @param ids id's of the native array
-     * @return boolean  true if it's an array, false otherwise (ie it's a map)
-     */
-    private static boolean isArray(final Object[] ids) {
-        boolean result = true;
-        for (int i = 0; i < ids.length; i++) {
-            if (ids[i] instanceof Integer == false) {
-                result = false;
-                break;
-            }
-        }
-        return result;
-    }
-}
diff --git a/plugins/lang-javascript/src/main/java/org/elasticsearch/script/javascript/support/ScriptableLinkedHashMap.java b/plugins/lang-javascript/src/main/java/org/elasticsearch/script/javascript/support/ScriptableLinkedHashMap.java
deleted file mode 100644
index 001711f818b..00000000000
--- a/plugins/lang-javascript/src/main/java/org/elasticsearch/script/javascript/support/ScriptableLinkedHashMap.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.script.javascript.support;
-
-import org.mozilla.javascript.Scriptable;
-
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * Implementation of a Scriptable Map. This is the best choice for maps that want to represent
- * JavaScript associative arrays - allowing access via key and integer index. It maintains and
- * respects insertion order of the elements and allows either string or integer keys.
- *
- *
- */
-public class ScriptableLinkedHashMap<K, V> extends LinkedHashMap<K, V> implements ScriptableMap<K, V> {
-    private Scriptable parentScope;
-    private Scriptable prototype;
-
-
-    public ScriptableLinkedHashMap() {
-    }
-
-    public ScriptableLinkedHashMap(int initialCapacity) {
-        super(initialCapacity);
-    }
-
-    public ScriptableLinkedHashMap(Map<K, V> source) {
-        super(source);
-    }
-
-    /**
-     * @see org.mozilla.javascript.Scriptable#getClassName()
-     */
-    @Override
-    public String getClassName() {
-        return "ScriptableMap";
-    }
-
-    /**
-     * @see org.mozilla.javascript.Scriptable#get(java.lang.String, org.mozilla.javascript.Scriptable)
-     */
-    @Override
-    public Object get(String name, Scriptable start) {
-        // get the property from the underlying QName map
-        if ("length".equals(name)) {
-            return this.size();
-        } else {
-            return get(name);
-        }
-    }
-
-    /**
-     * @see org.mozilla.javascript.Scriptable#get(int, org.mozilla.javascript.Scriptable)
-     */
-    @Override
-    public Object get(int index, Scriptable start) {
-        Object value = null;
-        int i = 0;
-        Iterator<V> itrValues = this.values().iterator();
-        while (i++ <= index && itrValues.hasNext()) {
-            value = itrValues.next();
-        }
-        return value;
-    }
-
-    /**
-     * @see org.mozilla.javascript.Scriptable#has(java.lang.String, org.mozilla.javascript.Scriptable)
-     */
-    @Override
-    public boolean has(String name, Scriptable start) {
-        // locate the property in the underlying map
-        return containsKey(name);
-    }
-
-    /**
-     * @see org.mozilla.javascript.Scriptable#has(int, org.mozilla.javascript.Scriptable)
-     */
-    @Override
-    public boolean has(int index, Scriptable start) {
-        return (index >= 0 && this.values().size() > index);
-    }
-
-    /**
-     * @see org.mozilla.javascript.Scriptable#put(java.lang.String, org.mozilla.javascript.Scriptable, java.lang.Object)
-     */
-    @Override
-    @SuppressWarnings("unchecked")
-    public void put(String name, Scriptable start, Object value) {
-        // add the property to the underlying QName map
-        put((K) name, (V) value);
-    }
-
-    /**
-     * @see org.mozilla.javascript.Scriptable#put(int, org.mozilla.javascript.Scriptable, java.lang.Object)
-     */
-    @Override
-    public void put(int index, Scriptable start, Object value) {
-        // TODO: implement?
-    }
-
-    /**
-     * @see org.mozilla.javascript.Scriptable#delete(java.lang.String)
-     */
-    @Override
-    public void delete(String name) {
-        // remove the property from the underlying QName map
-        remove(name);
-    }
-
-    /**
-     * @see org.mozilla.javascript.Scriptable#delete(int)
-     */
-    @Override
-    public void delete(int index) {
-        int i = 0;
-        Iterator<K> itrKeys = this.keySet().iterator();
-        while (i <= index && itrKeys.hasNext()) {
-            Object key = itrKeys.next();
-            if (i == index) {
-                remove(key);
-                break;
-            }
-        }
-    }
-
-    /**
-     * @see org.mozilla.javascript.Scriptable#getPrototype()
-     */
-    @Override
-    public Scriptable getPrototype() {
-        return this.prototype;
-    }
-
-    /**
-     * @see org.mozilla.javascript.Scriptable#setPrototype(org.mozilla.javascript.Scriptable)
-     */
-    @Override
-    public void setPrototype(Scriptable prototype) {
-        this.prototype = prototype;
-    }
-
-    /**
-     * @see org.mozilla.javascript.Scriptable#getParentScope()
-     */
-    @Override
-    public Scriptable getParentScope() {
-        return this.parentScope;
-    }
-
-    /**
-     * @see org.mozilla.javascript.Scriptable#setParentScope(org.mozilla.javascript.Scriptable)
-     */
-    @Override
-    public void setParentScope(Scriptable parent) {
-        this.parentScope = parent;
-    }
-
-    /**
-     * @see org.mozilla.javascript.Scriptable#getIds()
-     */
-    @Override
-    public Object[] getIds() {
-        return keySet().toArray();
-    }
-
-    /**
-     * @see org.mozilla.javascript.Scriptable#getDefaultValue(java.lang.Class)
-     */
-    @Override
-    public Object getDefaultValue(Class<?> hint) {
-        return null;
-    }
-
-    /**
-     * @see org.mozilla.javascript.Scriptable#hasInstance(org.mozilla.javascript.Scriptable)
-     */
-    @Override
-    public boolean hasInstance(Scriptable instance) {
-        return instance instanceof ScriptableLinkedHashMap;
-    }
-}
-
diff --git a/plugins/lang-javascript/src/main/java/org/elasticsearch/script/javascript/support/ScriptableMap.java b/plugins/lang-javascript/src/main/java/org/elasticsearch/script/javascript/support/ScriptableMap.java
deleted file mode 100644
index ed910c5afca..00000000000
--- a/plugins/lang-javascript/src/main/java/org/elasticsearch/script/javascript/support/ScriptableMap.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.script.javascript.support;
-
-import org.mozilla.javascript.Scriptable;
-
-import java.util.Map;
-
-/**
- * Contract to be implemented by classes providing Map like collections to JavaScript.
- *
- *
- */
-public interface ScriptableMap<K, V> extends Scriptable, Map<K, V> {
-}
diff --git a/plugins/lang-javascript/src/main/java/org/elasticsearch/script/javascript/support/ScriptableWrappedMap.java b/plugins/lang-javascript/src/main/java/org/elasticsearch/script/javascript/support/ScriptableWrappedMap.java
deleted file mode 100644
index 1aa2326482a..00000000000
--- a/plugins/lang-javascript/src/main/java/org/elasticsearch/script/javascript/support/ScriptableWrappedMap.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.script.javascript.support;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.mozilla.javascript.Scriptable;
-import org.mozilla.javascript.Wrapper;
-
-/**
- * Implementation of a Scriptable Map. This is the best choice where you want values to be
- * persisted directly to an underlying map supplied on construction. The class automatically
- * wraps/unwraps JS objects as they enter/leave the underlying map via the Scriptable interface
- * methods - objects are untouched if accessed via the usual Map interface methods.
- * <p>Access should be by string key only - not integer index - unless you are sure the wrapped
- * map will maintain insertion order of the elements.
- *
- *
- */
-public class ScriptableWrappedMap implements ScriptableMap<Object, Object>, Wrapper {
-    private Map<Object, Object> map;
-    private Scriptable parentScope;
-    private Scriptable prototype;
-
-
-    /**
-     * Construction
-     * @return scriptable wrapped map
-     */
-    public static ScriptableWrappedMap wrap(Scriptable scope, Map<Object, Object> map) {
-        return new ScriptableWrappedMap(scope, map);
-    }
-
-    /**
-     * Construct
-     */
-    public ScriptableWrappedMap(Map<Object, Object> map) {
-        this.map = map;
-    }
-
-    /**
-     * Construct
-     */
-    public ScriptableWrappedMap(Scriptable scope, Map<Object, Object> map) {
-        this.parentScope = scope;
-        this.map = map;
-    }
-
-    @Override
-    public Object unwrap() {
-        return map;
-    }
-
-    @Override
-    public String getClassName() {
-        return "ScriptableWrappedMap";
-    }
-
-    @Override
-    public Object get(String name, Scriptable start) {
-        // get the property from the underlying QName map
-        if ("length".equals(name)) {
-            return map.size();
-        } else {
-            return ScriptValueConverter.wrapValue(this.parentScope != null ? this.parentScope : start, map.get(name));
-        }
-    }
-
-    @Override
-    public Object get(int index, Scriptable start) {
-        Object value = null;
-        int i = 0;
-        Iterator<Object> itrValues = map.values().iterator();
-        while (i++ <= index && itrValues.hasNext()) {
-            value = itrValues.next();
-        }
-        return ScriptValueConverter.wrapValue(this.parentScope != null ? this.parentScope : start, value);
-    }
-
-    @Override
-    public boolean has(String name, Scriptable start) {
-        // locate the property in the underlying map
-        return map.containsKey(name);
-    }
-
-    @Override
-    public boolean has(int index, Scriptable start) {
-        return (index >= 0 && map.values().size() > index);
-    }
-
-    @Override
-    public void put(String name, Scriptable start, Object value) {
-        map.put(name, ScriptValueConverter.unwrapValue(value));
-    }
-
-    @Override
-    public void put(int index, Scriptable start, Object value) {
-        // TODO: implement?
-    }
-
-    @Override
-    public void delete(String name) {
-        map.remove(name);
-    }
-
-    @Override
-    public void delete(int index) {
-        int i = 0;
-        Iterator<Object> itrKeys = map.keySet().iterator();
-        while (i <= index && itrKeys.hasNext()) {
-            Object key = itrKeys.next();
-            if (i == index) {
-                map.remove(key);
-                break;
-            }
-        }
-    }
-
-    @Override
-    public Scriptable getPrototype() {
-        return this.prototype;
-    }
-
-    @Override
-    public void setPrototype(Scriptable prototype) {
-        this.prototype = prototype;
-    }
-
-    @Override
-    public Scriptable getParentScope() {
-        return this.parentScope;
-    }
-
-    @Override
-    public void setParentScope(Scriptable parent) {
-        this.parentScope = parent;
-    }
-
-    @Override
-    public Object[] getIds() {
-        return map.keySet().toArray();
-    }
-
-    @Override
-    public Object getDefaultValue(Class<?> hint) {
-        return null;
-    }
-
-    @Override
-    public boolean hasInstance(Scriptable value) {
-        if (!(value instanceof Wrapper))
-            return false;
-        Object instance = ((Wrapper) value).unwrap();
-        return Map.class.isInstance(instance);
-    }
-
-    @Override
-    public void clear() {
-        this.map.clear();
-    }
-
-    @Override
-    public boolean containsKey(Object key) {
-        return this.map.containsKey(key);
-    }
-
-    @Override
-    public boolean containsValue(Object value) {
-        return this.map.containsValue(value);
-    }
-
-    @Override
-    public Set<Map.Entry<Object, Object>> entrySet() {
-        return this.map.entrySet();
-    }
-
-    @Override
-    public Object get(Object key) {
-        return this.map.get(key);
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return (this.map.size() == 0);
-    }
-
-    @Override
-    public Set<Object> keySet() {
-        return this.map.keySet();
-    }
-
-    @Override
-    public Object put(Object key, Object value) {
-        return this.map.put(key, value);
-    }
-
-    @Override
-    public void putAll(Map<? extends Object, ? extends Object> t) {
-        this.map.putAll(t);
-    }
-
-    @Override
-    public Object remove(Object key) {
-        return this.map.remove(key);
-    }
-
-    @Override
-    public int size() {
-        return this.map.size();
-    }
-
-    @Override
-    public Collection<Object> values() {
-        return this.map.values();
-    }
-
-    @Override
-    public String toString() {
-        return (this.map != null ? this.map.toString() : super.toString());
-    }
-}
diff --git a/plugins/lang-javascript/src/main/plugin-metadata/plugin-security.policy b/plugins/lang-javascript/src/main/plugin-metadata/plugin-security.policy
deleted file mode 100644
index 739a2531d2f..00000000000
--- a/plugins/lang-javascript/src/main/plugin-metadata/plugin-security.policy
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-grant {
-  // needed to generate runtime classes
-  permission java.lang.RuntimePermission "createClassLoader";
-  
-  // Standard set of classes
-  permission org.elasticsearch.script.ClassPermission "<<STANDARD>>";
-  // rhino runtime (TODO: clean these up if possible)
-  permission org.elasticsearch.script.ClassPermission "org.mozilla.javascript.ContextFactory";
-  permission org.elasticsearch.script.ClassPermission "org.mozilla.javascript.Callable";
-  permission org.elasticsearch.script.ClassPermission "org.mozilla.javascript.NativeFunction";
-  permission org.elasticsearch.script.ClassPermission "org.mozilla.javascript.Script";
-  permission org.elasticsearch.script.ClassPermission "org.mozilla.javascript.ScriptRuntime";
-  permission org.elasticsearch.script.ClassPermission "org.mozilla.javascript.Undefined";
-  permission org.elasticsearch.script.ClassPermission "org.mozilla.javascript.optimizer.OptRuntime";
-};
diff --git a/plugins/lang-javascript/src/test/java/org/elasticsearch/script/javascript/JavaScriptScriptEngineTests.java b/plugins/lang-javascript/src/test/java/org/elasticsearch/script/javascript/JavaScriptScriptEngineTests.java
deleted file mode 100644
index dab2dac6c52..00000000000
--- a/plugins/lang-javascript/src/test/java/org/elasticsearch/script/javascript/JavaScriptScriptEngineTests.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.script.javascript;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static java.util.Collections.emptyMap;
-
-import org.elasticsearch.common.collect.MapBuilder;
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.script.CompiledScript;
-import org.elasticsearch.script.ExecutableScript;
-import org.elasticsearch.script.ScriptType;
-import org.elasticsearch.test.ESTestCase;
-import org.junit.After;
-import org.junit.Before;
-
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.instanceOf;
-
-public class JavaScriptScriptEngineTests extends ESTestCase {
-    private JavaScriptScriptEngineService se;
-
-    @Before
-    public void setup() {
-        se = new JavaScriptScriptEngineService(Settings.Builder.EMPTY_SETTINGS);
-    }
-
-    @After
-    public void close() {
-        se.close();
-    }
-
-    public void testSimpleEquation() {
-        Map<String, Object> vars = new HashMap<String, Object>();
-        Object o = se.executable(new CompiledScript(ScriptType.INLINE, "testSimpleEquation", "js", se.compile(null, "1 + 2", Collections.emptyMap())), vars).run();
-        assertThat(((Number) o).intValue(), equalTo(3));
-    }
-
-    public void testNullVars() {
-        CompiledScript script = new CompiledScript(ScriptType.INLINE, "testSimpleEquation", "js",
-                se.compile(null, "1 + 2", emptyMap()));
-        Object o = se.executable(script, null).run();
-        assertThat(((Number) o).intValue(), equalTo(3));
-    }
-
-    @SuppressWarnings("unchecked")
-    public void testMapAccess() {
-        Map<String, Object> vars = new HashMap<String, Object>();
-
-        Map<String, Object> obj2 = MapBuilder.<String, Object>newMapBuilder().put("prop2", "value2").map();
-        Map<String, Object> obj1 = MapBuilder.<String, Object>newMapBuilder().put("prop1", "value1").put("obj2", obj2).put("l", Arrays.asList("2", "1")).map();
-        vars.put("obj1", obj1);
-        Object o = se.executable(new CompiledScript(ScriptType.INLINE, "testMapAccess", "js", se.compile(null, "obj1", Collections.emptyMap())), vars).run();
-        assertThat(o, instanceOf(Map.class));
-        obj1 = (Map<String, Object>) o;
-        assertThat((String) obj1.get("prop1"), equalTo("value1"));
-        assertThat((String) ((Map<String, Object>) obj1.get("obj2")).get("prop2"), equalTo("value2"));
-
-        o = se.executable(new CompiledScript(ScriptType.INLINE, "testMapAccess", "js", se.compile(null, "obj1.l[0]", Collections.emptyMap())), vars).run();
-        assertThat(((String) o), equalTo("2"));
-    }
-
-    @SuppressWarnings("unchecked")
-    public void testJavaScriptObjectToMap() {
-        Map<String, Object> vars = new HashMap<String, Object>();
-        Object o = se.executable(new CompiledScript(ScriptType.INLINE, "testJavaScriptObjectToMap", "js",
-                se.compile(null, "var obj1 = {}; obj1.prop1 = 'value1'; obj1.obj2 = {}; obj1.obj2.prop2 = 'value2'; obj1", Collections.emptyMap())), vars).run();
-        Map<String, Object> obj1 = (Map<String, Object>) o;
-        assertThat((String) obj1.get("prop1"), equalTo("value1"));
-        assertThat((String) ((Map<String, Object>) obj1.get("obj2")).get("prop2"), equalTo("value2"));
-    }
-
-    @SuppressWarnings("unchecked")
-    public void testJavaScriptObjectMapInter() {
-        Map<String, Object> vars = new HashMap<String, Object>();
-        Map<String, Object> ctx = new HashMap<String, Object>();
-        Map<String, Object> obj1 = new HashMap<String, Object>();
-        obj1.put("prop1", "value1");
-        ctx.put("obj1", obj1);
-        vars.put("ctx", ctx);
-
-        ExecutableScript executable = se.executable(new CompiledScript(ScriptType.INLINE, "testJavaScriptObjectMapInter", "js",
-                se.compile(null, "ctx.obj2 = {}; ctx.obj2.prop2 = 'value2'; ctx.obj1.prop1 = 'uvalue1'", Collections.emptyMap())), vars);
-        executable.run();
-        ctx = (Map<String, Object>) executable.unwrap(vars.get("ctx"));
-        assertThat(ctx.containsKey("obj1"), equalTo(true));
-        assertThat((String) ((Map<String, Object>) ctx.get("obj1")).get("prop1"), equalTo("uvalue1"));
-        assertThat(ctx.containsKey("obj2"), equalTo(true));
-        assertThat((String) ((Map<String, Object>) ctx.get("obj2")).get("prop2"), equalTo("value2"));
-    }
-
-    @SuppressWarnings("unchecked")
-    public void testJavaScriptInnerArrayCreation() {
-        Map<String, Object> ctx = new HashMap<String, Object>();
-        Map<String, Object> doc = new HashMap<String, Object>();
-        ctx.put("doc", doc);
-
-        Object compiled = se.compile(null, "ctx.doc.field1 = ['value1', 'value2']", Collections.emptyMap());
-        ExecutableScript script = se.executable(new CompiledScript(ScriptType.INLINE, "testJavaScriptInnerArrayCreation", "js",
-                compiled), new HashMap<String, Object>());
-        script.setNextVar("ctx", ctx);
-        script.run();
-
-        Map<String, Object> unwrap = (Map<String, Object>) script.unwrap(ctx);
-
-        assertThat(((Map<String, Object>) unwrap.get("doc")).get("field1"), instanceOf(List.class));
-    }
-
-    @SuppressWarnings("unchecked")
-    public void testAccessListInScript() {
-        Map<String, Object> vars = new HashMap<String, Object>();
-        Map<String, Object> obj2 = MapBuilder.<String, Object>newMapBuilder().put("prop2", "value2").map();
-        Map<String, Object> obj1 = MapBuilder.<String, Object>newMapBuilder().put("prop1", "value1").put("obj2", obj2).map();
-        vars.put("l", Arrays.asList("1", "2", "3", obj1));
-
-        Object o = se.executable(new CompiledScript(ScriptType.INLINE, "testAccessInScript", "js",
-                se.compile(null, "l.length", Collections.emptyMap())), vars).run();
-        assertThat(((Number) o).intValue(), equalTo(4));
-
-        o = se.executable(new CompiledScript(ScriptType.INLINE, "testAccessInScript", "js",
-                se.compile(null, "l[0]", Collections.emptyMap())), vars).run();
-        assertThat(((String) o), equalTo("1"));
-
-        o = se.executable(new CompiledScript(ScriptType.INLINE, "testAccessInScript", "js",
-                se.compile(null, "l[3]", Collections.emptyMap())), vars).run();
-        obj1 = (Map<String, Object>) o;
-        assertThat((String) obj1.get("prop1"), equalTo("value1"));
-        assertThat((String) ((Map<String, Object>) obj1.get("obj2")).get("prop2"), equalTo("value2"));
-
-        o = se.executable(new CompiledScript(ScriptType.INLINE, "testAccessInScript", "js",
-                se.compile(null, "l[3].prop1", Collections.emptyMap())), vars).run();
-        assertThat(((String) o), equalTo("value1"));
-    }
-
-    public void testChangingVarsCrossExecution1() {
-        Map<String, Object> vars = new HashMap<String, Object>();
-        Map<String, Object> ctx = new HashMap<String, Object>();
-        vars.put("ctx", ctx);
-        Object compiledScript = se.compile(null, "ctx.value", Collections.emptyMap());
-
-        ExecutableScript script = se.executable(new CompiledScript(ScriptType.INLINE, "testChangingVarsCrossExecution1", "js",
-                compiledScript), vars);
-        ctx.put("value", 1);
-        Object o = script.run();
-        assertThat(((Number) o).intValue(), equalTo(1));
-
-        ctx.put("value", 2);
-        o = script.run();
-        assertThat(((Number) o).intValue(), equalTo(2));
-    }
-
-    public void testChangingVarsCrossExecution2() {
-        Map<String, Object> vars = new HashMap<String, Object>();
-        Object compiledScript = se.compile(null, "value", Collections.emptyMap());
-
-        ExecutableScript script = se.executable(new CompiledScript(ScriptType.INLINE, "testChangingVarsCrossExecution2", "js",
-                compiledScript), vars);
-        script.setNextVar("value", 1);
-        Object o = script.run();
-        assertThat(((Number) o).intValue(), equalTo(1));
-
-        script.setNextVar("value", 2);
-        o = script.run();
-        assertThat(((Number) o).intValue(), equalTo(2));
-    }
-}
diff --git a/plugins/lang-javascript/src/test/java/org/elasticsearch/script/javascript/JavaScriptScriptMultiThreadedTests.java b/plugins/lang-javascript/src/test/java/org/elasticsearch/script/javascript/JavaScriptScriptMultiThreadedTests.java
deleted file mode 100644
index a6ce1c95a20..00000000000
--- a/plugins/lang-javascript/src/test/java/org/elasticsearch/script/javascript/JavaScriptScriptMultiThreadedTests.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.script.javascript;
-
-import org.elasticsearch.common.Randomness;
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.script.CompiledScript;
-import org.elasticsearch.script.ExecutableScript;
-import org.elasticsearch.script.ScriptType;
-import org.elasticsearch.test.ESTestCase;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.CyclicBarrier;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import static org.hamcrest.Matchers.equalTo;
-
-public class JavaScriptScriptMultiThreadedTests extends ESTestCase {
-    public void testExecutableNoRuntimeParams() throws Exception {
-        final JavaScriptScriptEngineService se = new JavaScriptScriptEngineService(Settings.Builder.EMPTY_SETTINGS);
-        final Object compiled = se.compile(null, "x + y", Collections.emptyMap());
-        final AtomicBoolean failed = new AtomicBoolean();
-
-        Thread[] threads = new Thread[between(3, 12)];
-        final CountDownLatch latch = new CountDownLatch(threads.length);
-        final CyclicBarrier barrier = new CyclicBarrier(threads.length + 1);
-        for (int i = 0; i < threads.length; i++) {
-            threads[i] = new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        barrier.await();
-                        long x = Randomness.get().nextInt();
-                        long y = Randomness.get().nextInt();
-                        long addition = x + y;
-                        Map<String, Object> vars = new HashMap<String, Object>();
-                        vars.put("x", x);
-                        vars.put("y", y);
-                        ExecutableScript script = se.executable(new CompiledScript(ScriptType.INLINE, "testExecutableNoRuntimeParams", "js", compiled), vars);
-                        for (int i = 0; i < between(100, 1000); i++) {
-                            long result = ((Number) script.run()).longValue();
-                            assertThat(result, equalTo(addition));
-                        }
-                    } catch (Exception e) {
-                        failed.set(true);
-                        logger.error("failed", e);
-                    } finally {
-                        latch.countDown();
-                    }
-                }
-            });
-        }
-        for (int i = 0; i < threads.length; i++) {
-            threads[i].start();
-        }
-        barrier.await();
-        latch.await();
-        assertThat(failed.get(), equalTo(false));
-    }
-
-    public void testExecutableWithRuntimeParams() throws Exception {
-        final JavaScriptScriptEngineService se = new JavaScriptScriptEngineService(Settings.Builder.EMPTY_SETTINGS);
-        final Object compiled = se.compile(null, "x + y", Collections.emptyMap());
-        final AtomicBoolean failed = new AtomicBoolean();
-
-        Thread[] threads = new Thread[between(3, 12)];
-        final CountDownLatch latch = new CountDownLatch(threads.length);
-        final CyclicBarrier barrier = new CyclicBarrier(threads.length + 1);
-        for (int i = 0; i < threads.length; i++) {
-            threads[i] = new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        barrier.await();
-                        long x = Randomness.get().nextInt();
-                        Map<String, Object> vars = new HashMap<String, Object>();
-                        vars.put("x", x);
-                        ExecutableScript script = se.executable(new CompiledScript(ScriptType.INLINE, "testExecutableNoRuntimeParams", "js", compiled), vars);
-                        for (int i = 0; i < between(100, 1000); i++) {
-                            long y = Randomness.get().nextInt();
-                            long addition = x + y;
-                            script.setNextVar("y", y);
-                            long result = ((Number) script.run()).longValue();
-                            assertThat(result, equalTo(addition));
-                        }
-                    } catch (Exception e) {
-                        failed.set(true);
-                        logger.error("failed", e);
-                    } finally {
-                        latch.countDown();
-                    }
-                }
-            });
-        }
-        for (int i = 0; i < threads.length; i++) {
-            threads[i].start();
-        }
-        barrier.await();
-        latch.await();
-        assertThat(failed.get(), equalTo(false));
-    }
-
-    public void testExecute() throws Exception {
-        final JavaScriptScriptEngineService se = new JavaScriptScriptEngineService(Settings.Builder.EMPTY_SETTINGS);
-        final Object compiled = se.compile(null, "x + y", Collections.emptyMap());
-        final AtomicBoolean failed = new AtomicBoolean();
-
-        Thread[] threads = new Thread[between(3, 12)];
-        final CountDownLatch latch = new CountDownLatch(threads.length);
-        final CyclicBarrier barrier = new CyclicBarrier(threads.length + 1);
-        for (int i = 0; i < threads.length; i++) {
-            threads[i] = new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        barrier.await();
-                        Map<String, Object> runtimeVars = new HashMap<String, Object>();
-                        for (int i = 0; i < between(100, 1000); i++) {
-                            long x = Randomness.get().nextInt();
-                            long y = Randomness.get().nextInt();
-                            long addition = x + y;
-                            runtimeVars.put("x", x);
-                            runtimeVars.put("y", y);
-                            long result = ((Number) se.executable(new CompiledScript(ScriptType.INLINE, "testExecutableNoRuntimeParams", "js", compiled), runtimeVars).run()).longValue();
-                            assertThat(result, equalTo(addition));
-                        }
-                    } catch (Exception e) {
-                        failed.set(true);
-                        logger.error("failed", e);
-                    } finally {
-                        latch.countDown();
-                    }
-                }
-            });
-        }
-        for (int i = 0; i < threads.length; i++) {
-            threads[i].start();
-        }
-        barrier.await();
-        latch.await();
-        assertThat(failed.get(), equalTo(false));
-    }
-}
diff --git a/plugins/lang-javascript/src/test/java/org/elasticsearch/script/javascript/JavaScriptSecurityTests.java b/plugins/lang-javascript/src/test/java/org/elasticsearch/script/javascript/JavaScriptSecurityTests.java
deleted file mode 100644
index 3928627840a..00000000000
--- a/plugins/lang-javascript/src/test/java/org/elasticsearch/script/javascript/JavaScriptSecurityTests.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.script.javascript;
-
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.script.CompiledScript;
-import org.elasticsearch.script.ScriptType;
-import org.elasticsearch.test.ESTestCase;
-import org.mozilla.javascript.EcmaError;
-import org.mozilla.javascript.WrappedException;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Tests for the Javascript security permissions
- */
-public class JavaScriptSecurityTests extends ESTestCase {
-
-    private JavaScriptScriptEngineService se;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        se = new JavaScriptScriptEngineService(Settings.Builder.EMPTY_SETTINGS);
-        // otherwise will exit your VM and other bad stuff
-        assumeTrue("test requires security manager to be enabled", System.getSecurityManager() != null);
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-        se.close();
-        super.tearDown();
-    }
-
-    /** runs a script */
-    private void doTest(String script) {
-        Map<String, Object> vars = new HashMap<String, Object>();
-        se.executable(new CompiledScript(ScriptType.INLINE, "test", "js", se.compile(null, script, Collections.emptyMap())), vars).run();
-    }
-
-    /** asserts that a script runs without exception */
-    private void assertSuccess(String script) {
-        doTest(script);
-    }
-
-    /** assert that a security exception is hit */
-    private void assertFailure(String script, Class<? extends Throwable> exceptionClass) {
-        try {
-            doTest(script);
-            fail("did not get expected exception");
-        } catch (WrappedException expected) {
-            Throwable cause = expected.getCause();
-            assertNotNull(cause);
-            if (exceptionClass.isAssignableFrom(cause.getClass()) == false) {
-                throw new AssertionError("unexpected exception: " + expected, expected);
-            }
-        } catch (EcmaError expected) {
-            if (exceptionClass.isAssignableFrom(expected.getClass()) == false) {
-                throw new AssertionError("unexpected exception: " + expected, expected);
-            }
-        }
-    }
-
-    /** Test some javascripts that are ok */
-    public void testOK() {
-        assertSuccess("1 + 2");
-        assertSuccess("Math.cos(Math.PI)");
-        assertSuccess("Array.apply(null, Array(100)).map(function (_, i) {return i;}).map(function (i) {return i+1;})");
-    }
-
-    /** Test some javascripts that should hit security exception */
-    public void testNotOK() throws Exception {
-        // sanity check :)
-        assertFailure("java.lang.Runtime.getRuntime().halt(0)", EcmaError.class);
-        // check a few things more restrictive than the ordinary policy
-        // no network
-        assertFailure("new java.net.Socket(\"localhost\", 1024)", EcmaError.class);
-        // no files
-        assertFailure("java.io.File.createTempFile(\"test\", \"tmp\")", EcmaError.class);
-    }
-
-    public void testDefinitelyNotOK() {
-        // no mucking with security controller
-        assertFailure("var ctx = org.mozilla.javascript.Context.getCurrentContext(); " +
-                      "ctx.setSecurityController(new org.mozilla.javascript.PolicySecurityController());", EcmaError.class);
-        // no compiling scripts from scripts
-        assertFailure("var ctx = org.mozilla.javascript.Context.getCurrentContext(); " +
-                      "ctx.compileString(\"1 + 1\", \"foobar\", 1, null); ", EcmaError.class);
-    }
-}
diff --git a/plugins/lang-javascript/src/test/java/org/elasticsearch/script/javascript/LangJavascriptClientYamlTestSuiteIT.java b/plugins/lang-javascript/src/test/java/org/elasticsearch/script/javascript/LangJavascriptClientYamlTestSuiteIT.java
deleted file mode 100644
index 300b2325863..00000000000
--- a/plugins/lang-javascript/src/test/java/org/elasticsearch/script/javascript/LangJavascriptClientYamlTestSuiteIT.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.script.javascript;
-
-import com.carrotsearch.randomizedtesting.annotations.Name;
-import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
-
-import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
-import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
-import org.elasticsearch.test.rest.yaml.parser.ClientYamlTestParseException;
-
-import java.io.IOException;
-
-public class LangJavascriptClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
-
-    public LangJavascriptClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) {
-        super(testCandidate);
-    }
-
-    @ParametersFactory
-    public static Iterable<Object[]> parameters() throws IOException, ClientYamlTestParseException {
-        return ESClientYamlSuiteTestCase.createParameters();
-    }
-}
-
diff --git a/plugins/lang-javascript/src/test/resources/rest-api-spec/test/lang_javascript/10_basic.yaml b/plugins/lang-javascript/src/test/resources/rest-api-spec/test/lang_javascript/10_basic.yaml
deleted file mode 100644
index 021e17e4a83..00000000000
--- a/plugins/lang-javascript/src/test/resources/rest-api-spec/test/lang_javascript/10_basic.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Integration tests for Lang JavaScript components
-#
-setup:
-    - do:
-        index:
-            index: test
-            type: test
-            id: 1
-            body: { "foo": "aaa" }
-    - do:
-        indices.refresh: {}
-
----
-
-"Lang JavaScript":
-    - do:
-        search:
-            body:
-                script_fields:
-                    bar:
-                        script: 
-                            inline: "doc['foo.keyword'].value + x"
-                            lang: javascript
-                            params:
-                                x: "bbb"
-
-    - match: { hits.hits.0.fields.bar.0: "aaabbb"}
diff --git a/plugins/lang-javascript/src/test/resources/rest-api-spec/test/lang_javascript/20_search.yaml b/plugins/lang-javascript/src/test/resources/rest-api-spec/test/lang_javascript/20_search.yaml
deleted file mode 100644
index 043e9690303..00000000000
--- a/plugins/lang-javascript/src/test/resources/rest-api-spec/test/lang_javascript/20_search.yaml
+++ /dev/null
@@ -1,416 +0,0 @@
-# Integration tests for Lang JavaScript components
-#
-"JavaScript Query":
-    - do:
-        index:
-            index: test
-            type: test
-            id: 1
-            body: { "test": "value beck", "num1": 1.0 }
-    - do:
-        index:
-            index: test
-            type: test
-            id: 2
-            body: { "test": "value beck", "num1": 2.0 }
-    - do:
-        index:
-            index: test
-            type: test
-            id: 3
-            body: { "test": "value beck", "num1": 3.0 }
-    - do:
-        indices.refresh: {}
-
-    - do:
-        index: test
-        search:
-            body:
-                query:
-                    script:
-                        script:
-                            inline: "doc['num1'].value > 1"
-                            lang: javascript
-                script_fields:
-                    sNum1:
-                        script: 
-                            inline: "doc['num1'].value"
-                            lang: javascript
-                sort:
-                    num1:
-                        order: asc
-
-    - match: { hits.total: 2 }
-    - match: { hits.hits.0.fields.sNum1.0: 2.0 }
-    - match: { hits.hits.1.fields.sNum1.0: 3.0 }
-
-    - do:
-        index: test
-        search:
-            body:
-                query:
-                    script:
-                        script:
-                            inline: "doc['num1'].value > param1"
-                            lang: javascript
-                            params:
-                                param1: 1
-
-                script_fields:
-                    sNum1:
-                        script:
-                            inline: "doc['num1'].value"
-                            lang: javascript
-                sort:
-                    num1:
-                        order: asc
-
-    - match: { hits.total: 2 }
-    - match: { hits.hits.0.fields.sNum1.0: 2.0 }
-    - match: { hits.hits.1.fields.sNum1.0: 3.0 }
-
-    - do:
-        index: test
-        search:
-            body:
-                query:
-                    script:
-                        script:
-                            inline: "doc['num1'].value > param1"
-                            lang: javascript
-                            params:
-                                param1: -1
-
-                script_fields:
-                    sNum1:
-                        script: 
-                            inline: "doc['num1'].value"
-                            lang: javascript
-                sort:
-                    num1:
-                        order: asc
-
-    - match: { hits.total: 3 }
-    - match: { hits.hits.0.fields.sNum1.0: 1.0 }
-    - match: { hits.hits.1.fields.sNum1.0: 2.0 }
-    - match: { hits.hits.2.fields.sNum1.0: 3.0 }
-
-
----
-
-"JavaScript Script Field Using Source":
-    - do:
-        index:
-            index: test
-            type: test
-            id: 1
-            body: {
-              "obj1": {
-                "test": "something"
-              },
-              "obj2": {
-                "arr2": [ "arr_value1", "arr_value2" ]
-              }
-            }
-    - do:
-        indices.refresh: {}
-
-    - do:
-        index: test
-        search:
-            body:
-                script_fields:
-                    s_obj1:
-                        script: 
-                            inline: "_source.obj1"
-                            lang: javascript
-                    s_obj1_test:
-                        script: 
-                            inline: "_source.obj1.test"
-                            lang: javascript
-                    s_obj2:
-                        script: 
-                            inline: "_source.obj2"
-                            lang: javascript
-                    s_obj2_arr2:
-                        script: 
-                            inline: "_source.obj2.arr2"
-                            lang: javascript
-
-    - match: { hits.total: 1 }
-    - match: { hits.hits.0.fields.s_obj1.0.test: something }
-    - match: { hits.hits.0.fields.s_obj1_test.0: something }
-    - match: { hits.hits.0.fields.s_obj2.0.arr2.0: arr_value1 }
-    - match: { hits.hits.0.fields.s_obj2.0.arr2.1: arr_value2 }
-    - match: { hits.hits.0.fields.s_obj2_arr2.0: arr_value1 }
-    - match: { hits.hits.0.fields.s_obj2_arr2.1: arr_value2 }
-
----
-
-"JavaScript Custom Script Boost":
-    - do:
-        index:
-            index: test
-            type: test
-            id: 1
-            body: { "test": "value beck", "num1": 1.0 }
-    - do:
-        index:
-            index: test
-            type: test
-            id: 2
-            body: { "test": "value beck", "num1": 2.0 }
-    - do:
-        indices.refresh: {}
-
-    - do:
-        index: test
-        search:
-            body:
-                query:
-                    function_score:
-                        query:
-                            term:
-                                test: value
-                        "functions": [{
-                            "script_score": {
-                                "script": {
-                                    "lang": "javascript",
-                                    "inline": "doc['num1'].value"
-                                }
-                            }
-                        }]
-
-    - match: { hits.total: 2 }
-    - match: { hits.hits.0._id: "2" }
-    - match: { hits.hits.1._id: "1" }
-
-    - do:
-        index: test
-        search:
-            body:
-                query:
-                    function_score:
-                        query:
-                            term:
-                                test: value
-                        "functions": [{
-                            "script_score": {
-                                "script": {
-                                    "lang": "javascript",
-                                    "inline": "-doc['num1'].value"
-                                }
-                            }
-                        }]
-
-    - match: { hits.total: 2 }
-    - match: { hits.hits.0._id: "1" }
-    - match: { hits.hits.1._id: "2" }
-
-    - do:
-        index: test
-        search:
-            body:
-                query:
-                    function_score:
-                        query:
-                            term:
-                                test: value
-                        "functions": [{
-                            "script_score": {
-                                "script": {
-                                    "lang": "javascript",
-                                    "inline": "Math.pow(doc['num1'].value, 2)"
-                                }
-                            }
-                        }]
-
-    - match: { hits.total: 2 }
-    - match: { hits.hits.0._id: "2" }
-    - match: { hits.hits.1._id: "1" }
-
-    - do:
-        index: test
-        search:
-            body:
-                query:
-                    function_score:
-                        query:
-                            term:
-                                test: value
-                        "functions": [{
-                            "script_score": {
-                                "script": {
-                                    "lang": "javascript",
-                                    "inline": "Math.max(doc['num1'].value, 1)"
-                                }
-                            }
-                        }]
-
-    - match: { hits.total: 2 }
-    - match: { hits.hits.0._id: "2" }
-    - match: { hits.hits.1._id: "1" }
-
-    - do:
-        index: test
-        search:
-            body:
-                query:
-                    function_score:
-                        query:
-                            term:
-                                test: value
-                        "functions": [{
-                            "script_score": {
-                                "script": {
-                                    "lang": "javascript",
-                                    "inline": "doc['num1'].value * _score"
-                                }
-                            }
-                        }]
-
-    - match: { hits.total: 2 }
-    - match: { hits.hits.0._id: "2" }
-    - match: { hits.hits.1._id: "1" }
-
-    - do:
-        index: test
-        search:
-            body:
-                query:
-                    function_score:
-                        query:
-                            term:
-                                test: value
-                        "functions": [{
-                            "script_score": {
-                                "script": {
-                                    "lang": "javascript",
-                                    "inline": "param1 * param2 * _score",
-                                    "params": {
-                                        "param1": 2,
-                                        "param2": 2
-
-                                    }
-                                }
-                            }
-                        }]
-
-    - match: { hits.total: 2 }
-
----
-
-"JavaScript Scores Nested":
-    - do:
-        index:
-            index: test
-            type: test
-            id: 1
-            body: { "dummy_field": 1 }
-    - do:
-        indices.refresh: {}
-
-    - do:
-        index: test
-        search:
-            body:
-                query:
-                    function_score:
-                        query:
-                            function_score:
-                                "functions": [
-                                    {
-                                        "script_score": {
-                                            "script": {
-                                                "lang": "javascript",
-                                                "inline": "1"
-                                            }
-                                        }
-                                    }, {
-                                        "script_score": {
-                                            "script": {
-                                                "lang": "javascript",
-                                                "inline": "_score.doubleValue()"
-                                            }
-                                        }
-                                    }
-                                ]
-                        "functions": [{
-                            "script_score": {
-                                "script": {
-                                    "lang": "javascript",
-                                    "inline": "_score.doubleValue()"
-                                }
-                            }
-                        }]
-
-    - match: { hits.total: 1 }
-    - match: { hits.hits.0._score: 1.0 }
-
-
----
-
-"JavaScript Scores With Agg":
-    - do:
-        index:
-            index: test
-            type: test
-            id: 1
-            body: { "dummy_field": 1 }
-    - do:
-        indices.refresh: {}
-
-
-    - do:
-        index: test
-        search:
-            body:
-                query:
-                    function_score:
-                        "functions": [{
-                            "script_score": {
-                                "script": {
-                                    "lang": "javascript",
-                                    "inline": "_score.doubleValue()"
-                                }
-                            }
-                        }]
-                aggs:
-                    score_agg:
-                        terms:
-                            script:
-                                lang: javascript
-                                inline: "_score.doubleValue()"
-
-    - match: { hits.total: 1 }
-    - match: { hits.hits.0._score: 1.0 }
-    - match: { aggregations.score_agg.buckets.0.key: "1.0" }
-    - match: { aggregations.score_agg.buckets.0.doc_count: 1 }
-
----
-
-"JavaScript Use List Length In Scripts":
-    - do:
-        index:
-            index: test
-            type: test
-            id: 1
-            body: { "f": 42 }
-    - do:
-        indices.refresh: {}
-
-
-    - do:
-        index: test
-        search:
-            body:
-                script_fields:
-                    foobar:
-                        script: 
-                            inline: "doc['f'].values.length"
-                            lang: javascript
-
-
-    - match: { hits.total: 1 }
-    - match: { hits.hits.0.fields.foobar.0: 1 }
-
diff --git a/plugins/lang-python/build.gradle b/plugins/lang-python/build.gradle
deleted file mode 100644
index 3deda3be5f4..00000000000
--- a/plugins/lang-python/build.gradle
+++ /dev/null
@@ -1,528 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-esplugin {
-  description 'The Python language plugin allows to have python as the language of scripts to execute.'
-  classname 'org.elasticsearch.plugin.python.PythonPlugin'
-}
-
-dependencies {
-  compile 'org.python:jython-standalone:2.7.0'
-}
-
-integTest {
-  cluster {
-    setting 'script.inline', 'true'
-    setting 'script.stored', 'true'
-    setting 'script.max_compilations_per_minute', '1000'
-  }
-}
-
-thirdPartyAudit.excludes = [
-  // uses internal java api: sun.security.x509 (X509CertInfo, X509CertImpl, X500Name)
-  'org.python.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator',
-
-  // uses internal java api: sun.misc.Cleaner
-  'org.python.netty.util.internal.Cleaner0',
-
-  // uses internal java api: sun.misc.Signal
-  'jnr.posix.JavaPOSIX',
-  'jnr.posix.JavaPOSIX$SunMiscSignalHandler',
-
-  // uses internal java api: sun.misc.Unsafe
-  'com.kenai.jffi.MemoryIO$UnsafeImpl',
-  'com.kenai.jffi.MemoryIO$UnsafeImpl32',
-  'com.kenai.jffi.MemoryIO$UnsafeImpl64',
-  'org.python.google.common.cache.Striped64',
-  'org.python.google.common.cache.Striped64$1',
-  'org.python.google.common.cache.Striped64$Cell',
-  'org.python.google.common.primitives.UnsignedBytes$LexicographicalComparatorHolder$UnsafeComparator',
-  'org.python.google.common.primitives.UnsignedBytes$LexicographicalComparatorHolder$UnsafeComparator$1',
-  'org.python.netty.util.internal.chmv8.ForkJoinPool$2',
-  'org.python.netty.util.internal.PlatformDependent0',
-  'org.python.netty.util.internal.UnsafeAtomicIntegerFieldUpdater',
-  'org.python.netty.util.internal.UnsafeAtomicLongFieldUpdater',
-  'org.python.netty.util.internal.UnsafeAtomicReferenceFieldUpdater',
-  'org.python.netty.util.internal.chmv8.ConcurrentHashMapV8',
-  'org.python.netty.util.internal.chmv8.ConcurrentHashMapV8$1',
-  'org.python.netty.util.internal.chmv8.ConcurrentHashMapV8$TreeBin',
-  'org.python.netty.util.internal.chmv8.CountedCompleter',
-  'org.python.netty.util.internal.chmv8.CountedCompleter$1',
-  'org.python.netty.util.internal.chmv8.ForkJoinPool',
-  'org.python.netty.util.internal.chmv8.ForkJoinPool$WorkQueue',
-  'org.python.netty.util.internal.chmv8.ForkJoinTask',
-  'org.python.netty.util.internal.chmv8.ForkJoinTask$1',
-
-  // "uberjaring" (but not shading) classes that have been in the JDK since 1.5
-  // nice job python.
-  'javax.xml.XMLConstants',
-  'javax.xml.datatype.DatatypeConfigurationException',
-  'javax.xml.datatype.DatatypeConstants$1',
-  'javax.xml.datatype.DatatypeConstants$Field',
-  'javax.xml.datatype.DatatypeConstants',
-  'javax.xml.datatype.DatatypeFactory',
-  'javax.xml.datatype.Duration',
-  'javax.xml.datatype.FactoryFinder',
-  'javax.xml.datatype.SecuritySupport$1',
-  'javax.xml.datatype.SecuritySupport$2',
-  'javax.xml.datatype.SecuritySupport$3',
-  'javax.xml.datatype.SecuritySupport$4',
-  'javax.xml.datatype.SecuritySupport$5',
-  'javax.xml.datatype.SecuritySupport',
-  'javax.xml.datatype.XMLGregorianCalendar',
-  'javax.xml.namespace.NamespaceContext',
-  'javax.xml.namespace.QName$1',
-  'javax.xml.namespace.QName',
-  'javax.xml.parsers.DocumentBuilder',
-  'javax.xml.parsers.DocumentBuilderFactory',
-  'javax.xml.parsers.FactoryConfigurationError',
-  'javax.xml.parsers.FactoryFinder',
-  'javax.xml.parsers.ParserConfigurationException',
-  'javax.xml.parsers.SAXParser',
-  'javax.xml.parsers.SAXParserFactory',
-  'javax.xml.parsers.SecuritySupport$1',
-  'javax.xml.parsers.SecuritySupport$2',
-  'javax.xml.parsers.SecuritySupport$3',
-  'javax.xml.parsers.SecuritySupport$4',
-  'javax.xml.parsers.SecuritySupport$5',
-  'javax.xml.parsers.SecuritySupport',
-  'javax.xml.stream.EventFilter',
-  'javax.xml.stream.FactoryConfigurationError',
-  'javax.xml.stream.FactoryFinder',
-  'javax.xml.stream.Location',
-  'javax.xml.stream.SecuritySupport$1',
-  'javax.xml.stream.SecuritySupport$2',
-  'javax.xml.stream.SecuritySupport$3',
-  'javax.xml.stream.SecuritySupport$4',
-  'javax.xml.stream.SecuritySupport$5',
-  'javax.xml.stream.SecuritySupport',
-  'javax.xml.stream.StreamFilter',
-  'javax.xml.stream.XMLEventFactory',
-  'javax.xml.stream.XMLEventReader',
-  'javax.xml.stream.XMLEventWriter',
-  'javax.xml.stream.XMLInputFactory',
-  'javax.xml.stream.XMLOutputFactory',
-  'javax.xml.stream.XMLReporter',
-  'javax.xml.stream.XMLResolver',
-  'javax.xml.stream.XMLStreamConstants',
-  'javax.xml.stream.XMLStreamException',
-  'javax.xml.stream.XMLStreamReader',
-  'javax.xml.stream.XMLStreamWriter',
-  'javax.xml.stream.events.Attribute',
-  'javax.xml.stream.events.Characters',
-  'javax.xml.stream.events.Comment',
-  'javax.xml.stream.events.DTD',
-  'javax.xml.stream.events.EndDocument',
-  'javax.xml.stream.events.EndElement',
-  'javax.xml.stream.events.EntityDeclaration',
-  'javax.xml.stream.events.EntityReference',
-  'javax.xml.stream.events.Namespace',
-  'javax.xml.stream.events.NotationDeclaration',
-  'javax.xml.stream.events.ProcessingInstruction',
-  'javax.xml.stream.events.StartDocument',
-  'javax.xml.stream.events.StartElement',
-  'javax.xml.stream.events.XMLEvent',
-  'javax.xml.stream.util.EventReaderDelegate',
-  'javax.xml.stream.util.StreamReaderDelegate',
-  'javax.xml.stream.util.XMLEventAllocator',
-  'javax.xml.stream.util.XMLEventConsumer',
-  'javax.xml.transform.ErrorListener',
-  'javax.xml.transform.FactoryFinder',
-  'javax.xml.transform.OutputKeys',
-  'javax.xml.transform.Result',
-  'javax.xml.transform.SecuritySupport$1',
-  'javax.xml.transform.SecuritySupport$2',
-  'javax.xml.transform.SecuritySupport$3',
-  'javax.xml.transform.SecuritySupport$4',
-  'javax.xml.transform.SecuritySupport$5',
-  'javax.xml.transform.SecuritySupport',
-  'javax.xml.transform.Source',
-  'javax.xml.transform.SourceLocator',
-  'javax.xml.transform.Templates',
-  'javax.xml.transform.Transformer',
-  'javax.xml.transform.TransformerConfigurationException',
-  'javax.xml.transform.TransformerException',
-  'javax.xml.transform.TransformerFactory',
-  'javax.xml.transform.TransformerFactoryConfigurationError',
-  'javax.xml.transform.URIResolver',
-  'javax.xml.transform.dom.DOMLocator',
-  'javax.xml.transform.dom.DOMResult',
-  'javax.xml.transform.dom.DOMSource',
-  'javax.xml.transform.sax.SAXResult',
-  'javax.xml.transform.sax.SAXSource',
-  'javax.xml.transform.sax.SAXTransformerFactory',
-  'javax.xml.transform.sax.TemplatesHandler',
-  'javax.xml.transform.sax.TransformerHandler',
-  'javax.xml.transform.stax.StAXResult',
-  'javax.xml.transform.stax.StAXSource',
-  'javax.xml.transform.stream.StreamResult',
-  'javax.xml.transform.stream.StreamSource',
-  'javax.xml.validation.Schema',
-  'javax.xml.validation.SchemaFactory',
-  'javax.xml.validation.SchemaFactoryFinder$1',
-  'javax.xml.validation.SchemaFactoryFinder$2',
-  'javax.xml.validation.SchemaFactoryFinder',
-  'javax.xml.validation.SchemaFactoryLoader',
-  'javax.xml.validation.SecuritySupport$1',
-  'javax.xml.validation.SecuritySupport$2',
-  'javax.xml.validation.SecuritySupport$3',
-  'javax.xml.validation.SecuritySupport$4',
-  'javax.xml.validation.SecuritySupport$5',
-  'javax.xml.validation.SecuritySupport$6',
-  'javax.xml.validation.SecuritySupport$7',
-  'javax.xml.validation.SecuritySupport$8',
-  'javax.xml.validation.SecuritySupport',
-  'javax.xml.validation.TypeInfoProvider',
-  'javax.xml.validation.Validator',
-  'javax.xml.validation.ValidatorHandler',
-  'javax.xml.xpath.SecuritySupport$1',
-  'javax.xml.xpath.SecuritySupport$2',
-  'javax.xml.xpath.SecuritySupport$3',
-  'javax.xml.xpath.SecuritySupport$4',
-  'javax.xml.xpath.SecuritySupport$5',
-  'javax.xml.xpath.SecuritySupport$6',
-  'javax.xml.xpath.SecuritySupport$7',
-  'javax.xml.xpath.SecuritySupport$8',
-  'javax.xml.xpath.SecuritySupport',
-  'javax.xml.xpath.XPath',
-  'javax.xml.xpath.XPathConstants',
-  'javax.xml.xpath.XPathException',
-  'javax.xml.xpath.XPathExpression',
-  'javax.xml.xpath.XPathExpressionException',
-  'javax.xml.xpath.XPathFactory',
-  'javax.xml.xpath.XPathFactoryConfigurationException',
-  'javax.xml.xpath.XPathFactoryFinder$1',
-  'javax.xml.xpath.XPathFactoryFinder$2',
-  'javax.xml.xpath.XPathFactoryFinder',
-  'javax.xml.xpath.XPathFunction',
-  'javax.xml.xpath.XPathFunctionException',
-  'javax.xml.xpath.XPathFunctionResolver',
-  'javax.xml.xpath.XPathVariableResolver',
-  'org.w3c.dom.Attr',
-  'org.w3c.dom.CDATASection',
-  'org.w3c.dom.CharacterData',
-  'org.w3c.dom.Comment',
-  'org.w3c.dom.DOMConfiguration',
-  'org.w3c.dom.DOMError',
-  'org.w3c.dom.DOMErrorHandler',
-  'org.w3c.dom.DOMException',
-  'org.w3c.dom.DOMImplementation',
-  'org.w3c.dom.DOMImplementationList',
-  'org.w3c.dom.DOMImplementationSource',
-  'org.w3c.dom.DOMLocator',
-  'org.w3c.dom.DOMStringList',
-  'org.w3c.dom.Document',
-  'org.w3c.dom.DocumentFragment',
-  'org.w3c.dom.DocumentType',
-  'org.w3c.dom.Element',
-  'org.w3c.dom.Entity',
-  'org.w3c.dom.EntityReference',
-  'org.w3c.dom.NameList',
-  'org.w3c.dom.NamedNodeMap',
-  'org.w3c.dom.Node',
-  'org.w3c.dom.NodeList',
-  'org.w3c.dom.Notation',
-  'org.w3c.dom.ProcessingInstruction',
-  'org.w3c.dom.Text',
-  'org.w3c.dom.TypeInfo',
-  'org.w3c.dom.UserDataHandler',
-  'org.w3c.dom.bootstrap.DOMImplementationRegistry$1',
-  'org.w3c.dom.bootstrap.DOMImplementationRegistry$2',
-  'org.w3c.dom.bootstrap.DOMImplementationRegistry$3',
-  'org.w3c.dom.bootstrap.DOMImplementationRegistry$4',
-  'org.w3c.dom.bootstrap.DOMImplementationRegistry',
-  'org.w3c.dom.css.CSS2Properties',
-  'org.w3c.dom.css.CSSCharsetRule',
-  'org.w3c.dom.css.CSSFontFaceRule',
-  'org.w3c.dom.css.CSSImportRule',
-  'org.w3c.dom.css.CSSMediaRule',
-  'org.w3c.dom.css.CSSPageRule',
-  'org.w3c.dom.css.CSSPrimitiveValue',
-  'org.w3c.dom.css.CSSRule',
-  'org.w3c.dom.css.CSSRuleList',
-  'org.w3c.dom.css.CSSStyleDeclaration',
-  'org.w3c.dom.css.CSSStyleRule',
-  'org.w3c.dom.css.CSSStyleSheet',
-  'org.w3c.dom.css.CSSUnknownRule',
-  'org.w3c.dom.css.CSSValue',
-  'org.w3c.dom.css.CSSValueList',
-  'org.w3c.dom.css.Counter',
-  'org.w3c.dom.css.DOMImplementationCSS',
-  'org.w3c.dom.css.DocumentCSS',
-  'org.w3c.dom.css.ElementCSSInlineStyle',
-  'org.w3c.dom.css.RGBColor',
-  'org.w3c.dom.css.Rect',
-  'org.w3c.dom.css.ViewCSS',
-  'org.w3c.dom.events.DocumentEvent',
-  'org.w3c.dom.events.Event',
-  'org.w3c.dom.events.EventException',
-  'org.w3c.dom.events.EventListener',
-  'org.w3c.dom.events.EventTarget',
-  'org.w3c.dom.events.MouseEvent',
-  'org.w3c.dom.events.MutationEvent',
-  'org.w3c.dom.events.UIEvent',
-  'org.w3c.dom.html.HTMLAnchorElement',
-  'org.w3c.dom.html.HTMLAppletElement',
-  'org.w3c.dom.html.HTMLAreaElement',
-  'org.w3c.dom.html.HTMLBRElement',
-  'org.w3c.dom.html.HTMLBaseElement',
-  'org.w3c.dom.html.HTMLBaseFontElement',
-  'org.w3c.dom.html.HTMLBodyElement',
-  'org.w3c.dom.html.HTMLButtonElement',
-  'org.w3c.dom.html.HTMLCollection',
-  'org.w3c.dom.html.HTMLDListElement',
-  'org.w3c.dom.html.HTMLDOMImplementation',
-  'org.w3c.dom.html.HTMLDirectoryElement',
-  'org.w3c.dom.html.HTMLDivElement',
-  'org.w3c.dom.html.HTMLDocument',
-  'org.w3c.dom.html.HTMLElement',
-  'org.w3c.dom.html.HTMLFieldSetElement',
-  'org.w3c.dom.html.HTMLFontElement',
-  'org.w3c.dom.html.HTMLFormElement',
-  'org.w3c.dom.html.HTMLFrameElement',
-  'org.w3c.dom.html.HTMLFrameSetElement',
-  'org.w3c.dom.html.HTMLHRElement',
-  'org.w3c.dom.html.HTMLHeadElement',
-  'org.w3c.dom.html.HTMLHeadingElement',
-  'org.w3c.dom.html.HTMLHtmlElement',
-  'org.w3c.dom.html.HTMLIFrameElement',
-  'org.w3c.dom.html.HTMLImageElement',
-  'org.w3c.dom.html.HTMLInputElement',
-  'org.w3c.dom.html.HTMLIsIndexElement',
-  'org.w3c.dom.html.HTMLLIElement',
-  'org.w3c.dom.html.HTMLLabelElement',
-  'org.w3c.dom.html.HTMLLegendElement',
-  'org.w3c.dom.html.HTMLLinkElement',
-  'org.w3c.dom.html.HTMLMapElement',
-  'org.w3c.dom.html.HTMLMenuElement',
-  'org.w3c.dom.html.HTMLMetaElement',
-  'org.w3c.dom.html.HTMLModElement',
-  'org.w3c.dom.html.HTMLOListElement',
-  'org.w3c.dom.html.HTMLObjectElement',
-  'org.w3c.dom.html.HTMLOptGroupElement',
-  'org.w3c.dom.html.HTMLOptionElement',
-  'org.w3c.dom.html.HTMLParagraphElement',
-  'org.w3c.dom.html.HTMLParamElement',
-  'org.w3c.dom.html.HTMLPreElement',
-  'org.w3c.dom.html.HTMLQuoteElement',
-  'org.w3c.dom.html.HTMLScriptElement',
-  'org.w3c.dom.html.HTMLSelectElement',
-  'org.w3c.dom.html.HTMLStyleElement',
-  'org.w3c.dom.html.HTMLTableCaptionElement',
-  'org.w3c.dom.html.HTMLTableCellElement',
-  'org.w3c.dom.html.HTMLTableColElement',
-  'org.w3c.dom.html.HTMLTableElement',
-  'org.w3c.dom.html.HTMLTableRowElement',
-  'org.w3c.dom.html.HTMLTableSectionElement',
-  'org.w3c.dom.html.HTMLTextAreaElement',
-  'org.w3c.dom.html.HTMLTitleElement',
-  'org.w3c.dom.html.HTMLUListElement',
-  'org.w3c.dom.ls.DOMImplementationLS',
-  'org.w3c.dom.ls.LSException',
-  'org.w3c.dom.ls.LSInput',
-  'org.w3c.dom.ls.LSLoadEvent',
-  'org.w3c.dom.ls.LSOutput',
-  'org.w3c.dom.ls.LSParser',
-  'org.w3c.dom.ls.LSParserFilter',
-  'org.w3c.dom.ls.LSProgressEvent',
-  'org.w3c.dom.ls.LSResourceResolver',
-  'org.w3c.dom.ls.LSSerializer',
-  'org.w3c.dom.ls.LSSerializerFilter',
-  'org.w3c.dom.ranges.DocumentRange',
-  'org.w3c.dom.ranges.Range',
-  'org.w3c.dom.ranges.RangeException',
-  'org.w3c.dom.stylesheets.DocumentStyle',
-  'org.w3c.dom.stylesheets.LinkStyle',
-  'org.w3c.dom.stylesheets.MediaList',
-  'org.w3c.dom.stylesheets.StyleSheet',
-  'org.w3c.dom.stylesheets.StyleSheetList',
-  'org.w3c.dom.traversal.DocumentTraversal',
-  'org.w3c.dom.traversal.NodeFilter',
-  'org.w3c.dom.traversal.NodeIterator',
-  'org.w3c.dom.traversal.TreeWalker',
-  'org.w3c.dom.views.AbstractView',
-  'org.w3c.dom.views.DocumentView',
-  'org.w3c.dom.xpath.XPathEvaluator',
-  'org.w3c.dom.xpath.XPathException',
-  'org.w3c.dom.xpath.XPathExpression',
-  'org.w3c.dom.xpath.XPathNSResolver',
-  'org.w3c.dom.xpath.XPathNamespace',
-  'org.w3c.dom.xpath.XPathResult',
-  'org.xml.sax.AttributeList',
-  'org.xml.sax.Attributes',
-  'org.xml.sax.ContentHandler',
-  'org.xml.sax.DTDHandler',
-  'org.xml.sax.DocumentHandler',
-  'org.xml.sax.EntityResolver',
-  'org.xml.sax.ErrorHandler',
-  'org.xml.sax.HandlerBase',
-  'org.xml.sax.InputSource',
-  'org.xml.sax.Locator',
-  'org.xml.sax.Parser',
-  'org.xml.sax.SAXException',
-  'org.xml.sax.SAXNotRecognizedException',
-  'org.xml.sax.SAXNotSupportedException',
-  'org.xml.sax.SAXParseException',
-  'org.xml.sax.XMLFilter',
-  'org.xml.sax.XMLReader',
-  'org.xml.sax.ext.Attributes2',
-  'org.xml.sax.ext.Attributes2Impl',
-  'org.xml.sax.ext.DeclHandler',
-  'org.xml.sax.ext.DefaultHandler2',
-  'org.xml.sax.ext.EntityResolver2',
-  'org.xml.sax.ext.LexicalHandler',
-  'org.xml.sax.ext.Locator2',
-  'org.xml.sax.ext.Locator2Impl',
-  'org.xml.sax.helpers.AttributeListImpl',
-  'org.xml.sax.helpers.AttributesImpl',
-  'org.xml.sax.helpers.DefaultHandler',
-  'org.xml.sax.helpers.LocatorImpl',
-  'org.xml.sax.helpers.NamespaceSupport$Context',
-  'org.xml.sax.helpers.NamespaceSupport',
-  'org.xml.sax.helpers.NewInstance',
-  'org.xml.sax.helpers.ParserAdapter$AttributeListAdapter',
-  'org.xml.sax.helpers.ParserAdapter',
-  'org.xml.sax.helpers.ParserFactory',
-  'org.xml.sax.helpers.SecuritySupport$1',
-  'org.xml.sax.helpers.SecuritySupport$2',
-  'org.xml.sax.helpers.SecuritySupport$3',
-  'org.xml.sax.helpers.SecuritySupport$4',
-  'org.xml.sax.helpers.SecuritySupport',
-  'org.xml.sax.helpers.XMLFilterImpl',
-  'org.xml.sax.helpers.XMLReaderAdapter$AttributesAdapter',
-  'org.xml.sax.helpers.XMLReaderAdapter',
-  'org.xml.sax.helpers.XMLReaderFactory',
-
-  // classes are missing
-  'com.jcraft.jzlib.Deflater', 
-  'com.jcraft.jzlib.Inflater', 
-  'com.jcraft.jzlib.JZlib$WrapperType', 
-  'com.jcraft.jzlib.JZlib', 
-  'javassist.ClassClassPath', 
-  'javassist.ClassPath', 
-  'javassist.ClassPool', 
-  'javassist.CtClass', 
-  'javassist.CtMethod', 
-  'javax.servlet.Filter', 
-  'javax.servlet.FilterChain', 
-  'javax.servlet.FilterConfig', 
-  'javax.servlet.ServletConfig', 
-  'javax.servlet.ServletContext', 
-  'javax.servlet.ServletContextEvent', 
-  'javax.servlet.ServletContextListener', 
-  'javax.servlet.ServletException', 
-  'javax.servlet.ServletRequest', 
-  'javax.servlet.ServletResponse', 
-  'javax.servlet.http.HttpServlet', 
-  'javax.servlet.http.HttpServletRequest', 
-  'javax.servlet.http.HttpServletResponse', 
-  'jnr.x86asm.Asm', 
-  'jnr.x86asm.Assembler', 
-  'jnr.x86asm.CPU', 
-  'jnr.x86asm.Mem', 
-  'jnr.x86asm.Register', 
-  'junit.framework.Assert', 
-  'junit.framework.TestCase', 
-  'org.antlr.stringtemplate.StringTemplate', 
-  'org.eclipse.jetty.alpn.ALPN$ClientProvider', 
-  'org.eclipse.jetty.alpn.ALPN$ServerProvider', 
-  'org.eclipse.jetty.alpn.ALPN', 
-  'org.eclipse.jetty.npn.NextProtoNego$ClientProvider', 
-  'org.eclipse.jetty.npn.NextProtoNego$ServerProvider', 
-  'org.eclipse.jetty.npn.NextProtoNego', 
-  'org.jboss.marshalling.ByteInput', 
-  'org.jboss.marshalling.ByteOutput', 
-  'org.jboss.marshalling.Marshaller', 
-  'org.jboss.marshalling.MarshallerFactory', 
-  'org.jboss.marshalling.MarshallingConfiguration', 
-  'org.jboss.marshalling.Unmarshaller', 
-  'org.junit.Assert', 
-  'org.junit.internal.matchers.CombinableMatcher', 
-  'org.junit.matchers.JUnitMatchers', 
-  'org.junit.runner.JUnitCore',
-  'org.python.apache.commons.logging.Log', 
-  'org.python.apache.commons.logging.LogFactory', 
-  'org.python.apache.log4j.Level', 
-  'org.python.apache.log4j.Logger', 
-  'org.python.apache.tomcat.jni.Buffer', 
-  'org.python.apache.tomcat.jni.CertificateVerifier', 
-  'org.python.apache.tomcat.jni.Library', 
-  'org.python.apache.tomcat.jni.Pool', 
-  'org.python.apache.tomcat.jni.SSL', 
-  'org.python.apache.tomcat.jni.SSLContext', 
-  'org.python.apache.tools.ant.BuildException', 
-  'org.python.apache.tools.ant.DirectoryScanner', 
-  'org.python.apache.tools.ant.Project', 
-  'org.python.apache.tools.ant.taskdefs.Execute', 
-  'org.python.apache.tools.ant.taskdefs.Java', 
-  'org.python.apache.tools.ant.taskdefs.MatchingTask', 
-  'org.python.apache.tools.ant.types.Commandline$Argument', 
-  'org.python.apache.tools.ant.types.Path', 
-  'org.python.apache.tools.ant.types.Resource', 
-  'org.python.apache.tools.ant.types.ResourceCollection', 
-  'org.python.apache.tools.ant.types.resources.BaseResourceCollectionContainer', 
-  'org.python.apache.tools.ant.util.GlobPatternMapper', 
-  'org.python.apache.tools.ant.util.SourceFileScanner', 
-  'org.python.apache.xml.resolver.Catalog', 
-  'org.python.apache.xml.resolver.CatalogManager', 
-  'org.python.apache.xml.resolver.readers.SAXCatalogReader', 
-  'org.python.google.protobuf.CodedInputStream', 
-  'org.python.google.protobuf.CodedOutputStream', 
-  'org.python.google.protobuf.ExtensionRegistry', 
-  'org.python.google.protobuf.ExtensionRegistryLite', 
-  'org.python.google.protobuf.MessageLite$Builder', 
-  'org.python.google.protobuf.MessageLite', 
-  'org.python.google.protobuf.MessageLiteOrBuilder', 
-  'org.python.google.protobuf.Parser', 
-  'org.python.objectweb.asm.tree.AbstractInsnNode', 
-  'org.python.objectweb.asm.tree.ClassNode', 
-  'org.python.objectweb.asm.tree.InsnList', 
-  'org.python.objectweb.asm.tree.InsnNode', 
-  'org.python.objectweb.asm.tree.JumpInsnNode', 
-  'org.python.objectweb.asm.tree.LabelNode', 
-  'org.python.objectweb.asm.tree.LocalVariableNode', 
-  'org.python.objectweb.asm.tree.LookupSwitchInsnNode', 
-  'org.python.objectweb.asm.tree.MethodNode', 
-  'org.python.objectweb.asm.tree.TableSwitchInsnNode', 
-  'org.python.objectweb.asm.tree.TryCatchBlockNode', 
-  'org.python.objectweb.asm.tree.analysis.Analyzer', 
-  'org.python.objectweb.asm.tree.analysis.BasicValue', 
-  'org.python.objectweb.asm.tree.analysis.BasicVerifier', 
-  'org.python.objectweb.asm.tree.analysis.Frame', 
-  'org.python.objectweb.asm.tree.analysis.SimpleVerifier', 
-  'org.slf4j.Logger',
-  'org.slf4j.LoggerFactory',
-  'org.tukaani.xz.ARMOptions', 
-  'org.tukaani.xz.ARMThumbOptions', 
-  'org.tukaani.xz.DeltaOptions', 
-  'org.tukaani.xz.FilterOptions', 
-  'org.tukaani.xz.FinishableWrapperOutputStream', 
-  'org.tukaani.xz.IA64Options', 
-  'org.tukaani.xz.LZMA2InputStream', 
-  'org.tukaani.xz.LZMA2Options', 
-  'org.tukaani.xz.LZMAInputStream', 
-  'org.tukaani.xz.PowerPCOptions', 
-  'org.tukaani.xz.SPARCOptions', 
-  'org.tukaani.xz.SingleXZInputStream', 
-  'org.tukaani.xz.UnsupportedOptionsException', 
-  'org.tukaani.xz.X86Options', 
-  'org.tukaani.xz.XZ', 
-  'org.tukaani.xz.XZInputStream', 
-  'org.tukaani.xz.XZOutputStream',
-]
diff --git a/plugins/lang-python/licenses/jython-standalone-2.7.0.jar.sha1 b/plugins/lang-python/licenses/jython-standalone-2.7.0.jar.sha1
deleted file mode 100644
index c55bf891622..00000000000
--- a/plugins/lang-python/licenses/jython-standalone-2.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cdfb38bc6f8343bcf1d6accc2e1147e8e7b63b75
diff --git a/plugins/lang-python/licenses/jython-standalone-LICENSE.txt b/plugins/lang-python/licenses/jython-standalone-LICENSE.txt
deleted file mode 100644
index 261eeb9e9f8..00000000000
--- a/plugins/lang-python/licenses/jython-standalone-LICENSE.txt
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/plugins/lang-python/licenses/jython-standalone-NOTICE.txt b/plugins/lang-python/licenses/jython-standalone-NOTICE.txt
deleted file mode 100644
index db0a7592a61..00000000000
--- a/plugins/lang-python/licenses/jython-standalone-NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Apache Commons Compress
-Copyright 2002-2014 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-The files in the package org.apache.commons.compress.archivers.sevenz
-were derived from the LZMA SDK, version 9.20 (C/ and CPP/7zip/),
-which has been placed in the public domain:
-
-"LZMA SDK is placed in the public domain." (http://www.7-zip.org/sdk.html)
diff --git a/plugins/lang-python/src/main/java/org/elasticsearch/plugin/python/PythonPlugin.java b/plugins/lang-python/src/main/java/org/elasticsearch/plugin/python/PythonPlugin.java
deleted file mode 100644
index f2f889e0ea7..00000000000
--- a/plugins/lang-python/src/main/java/org/elasticsearch/plugin/python/PythonPlugin.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.plugin.python;
-
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.plugins.Plugin;
-import org.elasticsearch.plugins.ScriptPlugin;
-import org.elasticsearch.script.ScriptEngineRegistry;
-import org.elasticsearch.script.ScriptEngineService;
-import org.elasticsearch.script.ScriptModule;
-import org.elasticsearch.script.python.PythonScriptEngineService;
-
-public class PythonPlugin extends Plugin implements ScriptPlugin {
-    @Override
-    public ScriptEngineService getScriptEngineService(Settings settings) {
-        return new PythonScriptEngineService(settings);
-    }
-}
diff --git a/plugins/lang-python/src/main/java/org/elasticsearch/script/python/PythonScriptEngineService.java b/plugins/lang-python/src/main/java/org/elasticsearch/script/python/PythonScriptEngineService.java
deleted file mode 100644
index 3674a280a6e..00000000000
--- a/plugins/lang-python/src/main/java/org/elasticsearch/script/python/PythonScriptEngineService.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.script.python;
-
-import org.apache.lucene.index.LeafReaderContext;
-import org.apache.lucene.search.Scorer;
-import org.elasticsearch.SpecialPermission;
-import org.elasticsearch.common.Nullable;
-import org.elasticsearch.common.component.AbstractComponent;
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.script.ClassPermission;
-import org.elasticsearch.script.CompiledScript;
-import org.elasticsearch.script.ExecutableScript;
-import org.elasticsearch.script.LeafSearchScript;
-import org.elasticsearch.script.ScoreAccessor;
-import org.elasticsearch.script.ScriptEngineService;
-import org.elasticsearch.script.SearchScript;
-import org.elasticsearch.search.lookup.LeafSearchLookup;
-import org.elasticsearch.search.lookup.SearchLookup;
-import org.python.core.Py;
-import org.python.core.PyCode;
-import org.python.core.PyObject;
-import org.python.core.PyStringMap;
-import org.python.util.PythonInterpreter;
-
-import java.io.IOException;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.Permissions;
-import java.security.PrivilegedAction;
-import java.security.ProtectionDomain;
-import java.util.Map;
-
-//TODO we can optimize the case for Map<String, Object> similar to PyStringMap
-public class PythonScriptEngineService extends AbstractComponent implements ScriptEngineService {
-
-    public static final String NAME = "python";
-    public static final String EXTENSION = "py";
-
-    private final PythonInterpreter interp;
-
-    public PythonScriptEngineService(Settings settings) {
-        super(settings);
-
-        deprecationLogger.deprecated("[python] scripts are deprecated, use [painless] scripts instead.");
-
-        // classloader created here
-        final SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            sm.checkPermission(new SpecialPermission());
-        }
-        this.interp = AccessController.doPrivileged(new PrivilegedAction<PythonInterpreter> () {
-            @Override
-            public PythonInterpreter run() {
-                // snapshot our context here for checks, as the script has no permissions
-                final AccessControlContext engineContext = AccessController.getContext();
-                PythonInterpreter interp = PythonInterpreter.threadLocalStateInterpreter(null);
-                if (sm != null) {
-                    interp.getSystemState().setClassLoader(new ClassLoader(getClass().getClassLoader()) {
-                        @Override
-                        protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
-                            try {
-                                engineContext.checkPermission(new ClassPermission(name));
-                            } catch (SecurityException e) {
-                                throw new ClassNotFoundException(name, e);
-                            }
-                            return super.loadClass(name, resolve);
-                        }
-                    });
-                }
-                return interp;
-            }
-        });
-    }
-
-    @Override
-    public String getType() {
-        return NAME;
-    }
-
-    @Override
-    public String getExtension() {
-        return EXTENSION;
-    }
-
-    @Override
-    public Object compile(String scriptName, String scriptSource, Map<String, String> params) {
-        // classloader created here
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            sm.checkPermission(new SpecialPermission());
-        }
-        return AccessController.doPrivileged(new PrivilegedAction<PyCode>() {
-            @Override
-            public PyCode run() {
-                return interp.compile(scriptSource);
-            }
-        });
-    }
-
-    @Override
-    public ExecutableScript executable(CompiledScript compiledScript, Map<String, Object> vars) {
-        deprecationLogger.deprecated("[python] scripts are deprecated, use [painless] scripts instead");
-
-        return new PythonExecutableScript((PyCode) compiledScript.compiled(), vars);
-    }
-
-    @Override
-    public SearchScript search(final CompiledScript compiledScript, final SearchLookup lookup, @Nullable final Map<String, Object> vars) {
-        deprecationLogger.deprecated("[python] scripts are deprecated, use [painless] scripts instead");
-
-        return new SearchScript() {
-            @Override
-            public LeafSearchScript getLeafSearchScript(LeafReaderContext context) throws IOException {
-                final LeafSearchLookup leafLookup = lookup.getLeafSearchLookup(context);
-                return new PythonSearchScript((PyCode) compiledScript.compiled(), vars, leafLookup);
-            }
-            @Override
-            public boolean needsScores() {
-                // TODO: can we reliably know if a python script makes use of _score
-                return true;
-            }
-        };
-    }
-
-    @Override
-    public void close() {
-        interp.cleanup();
-    }
-
-    public class PythonExecutableScript implements ExecutableScript {
-
-        private final PyCode code;
-
-        private final PyStringMap pyVars;
-
-        public PythonExecutableScript(PyCode code, Map<String, Object> vars) {
-            this.code = code;
-            this.pyVars = new PyStringMap();
-            if (vars != null) {
-                for (Map.Entry<String, Object> entry : vars.entrySet()) {
-                    pyVars.__setitem__(entry.getKey(), Py.java2py(entry.getValue()));
-                }
-            }
-        }
-
-        @Override
-        public void setNextVar(String name, Object value) {
-            pyVars.__setitem__(name, Py.java2py(value));
-        }
-
-        @Override
-        public Object run() {
-            interp.setLocals(pyVars);
-            // eval the script with reduced privileges
-            PyObject ret = evalRestricted(code);
-            if (ret == null) {
-                return null;
-            }
-            return ret.__tojava__(Object.class);
-        }
-
-        @Override
-        public Object unwrap(Object value) {
-            return unwrapValue(value);
-        }
-    }
-
-    public class PythonSearchScript implements LeafSearchScript {
-
-        private final PyCode code;
-
-        private final PyStringMap pyVars;
-
-        private final LeafSearchLookup lookup;
-
-        public PythonSearchScript(PyCode code, Map<String, Object> vars, LeafSearchLookup lookup) {
-            this.code = code;
-            this.pyVars = new PyStringMap();
-            for (Map.Entry<String, Object> entry : lookup.asMap().entrySet()) {
-                pyVars.__setitem__(entry.getKey(), Py.java2py(entry.getValue()));
-            }
-            if (vars != null) {
-                for (Map.Entry<String, Object> entry : vars.entrySet()) {
-                    pyVars.__setitem__(entry.getKey(), Py.java2py(entry.getValue()));
-                }
-            }
-            this.lookup = lookup;
-        }
-
-        @Override
-        public void setScorer(Scorer scorer) {
-            pyVars.__setitem__("_score", Py.java2py(new ScoreAccessor(scorer)));
-        }
-
-        @Override
-        public void setDocument(int doc) {
-            lookup.setDocument(doc);
-        }
-
-        @Override
-        public void setSource(Map<String, Object> source) {
-            lookup.source().setSource(source);
-        }
-
-        @Override
-        public void setNextVar(String name, Object value) {
-            pyVars.__setitem__(name, Py.java2py(value));
-        }
-
-        @Override
-        public Object run() {
-            interp.setLocals(pyVars);
-            // eval the script with reduced privileges
-            PyObject ret = evalRestricted(code);
-            if (ret == null) {
-                return null;
-            }
-            return ret.__tojava__(Object.class);
-        }
-
-        @Override
-        public long runAsLong() {
-            return ((Number) run()).longValue();
-        }
-
-        @Override
-        public double runAsDouble() {
-            return ((Number) run()).doubleValue();
-        }
-
-        @Override
-        public Object unwrap(Object value) {
-            return unwrapValue(value);
-        }
-    }
-
-    // we don't have a way to specify codesource for generated jython classes,
-    // so we just run them with a special context to reduce privileges
-    private static final AccessControlContext PY_CONTEXT;
-    static {
-        Permissions none = new Permissions();
-        none.setReadOnly();
-        PY_CONTEXT = new AccessControlContext(new ProtectionDomain[] {
-                new ProtectionDomain(null, none)
-        });
-    }
-
-    /** Evaluates with reduced privileges */
-    private PyObject evalRestricted(final PyCode code) {
-        // eval the script with reduced privileges
-        return AccessController.doPrivileged(new PrivilegedAction<PyObject>() {
-            @Override
-            public PyObject run() {
-                return interp.eval(code);
-            }
-        }, PY_CONTEXT);
-    }
-
-    public static Object unwrapValue(Object value) {
-        if (value == null) {
-            return null;
-        } else if (value instanceof PyObject) {
-            // seems like this is enough, inner PyDictionary will do the conversion for us for example, so expose it directly
-            return ((PyObject) value).__tojava__(Object.class);
-        }
-        return value;
-    }
-}
diff --git a/plugins/lang-python/src/main/plugin-metadata/plugin-security.policy b/plugins/lang-python/src/main/plugin-metadata/plugin-security.policy
deleted file mode 100644
index 86f4df64db4..00000000000
--- a/plugins/lang-python/src/main/plugin-metadata/plugin-security.policy
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-grant {
-  // needed to generate runtime classes
-  permission java.lang.RuntimePermission "createClassLoader";
-  // needed by PySystemState init (TODO: see if we can avoid this)
-  permission java.lang.RuntimePermission "getClassLoader";
-  // Standard set of classes
-  permission org.elasticsearch.script.ClassPermission "<<STANDARD>>";
-};
diff --git a/plugins/lang-python/src/test/java/org/elasticsearch/script/python/LangPythonClientYamlTestSuiteIT.java b/plugins/lang-python/src/test/java/org/elasticsearch/script/python/LangPythonClientYamlTestSuiteIT.java
deleted file mode 100644
index a0b4452ba44..00000000000
--- a/plugins/lang-python/src/test/java/org/elasticsearch/script/python/LangPythonClientYamlTestSuiteIT.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.script.python;
-
-import com.carrotsearch.randomizedtesting.annotations.Name;
-import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
-
-import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
-import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
-import org.elasticsearch.test.rest.yaml.parser.ClientYamlTestParseException;
-
-import java.io.IOException;
-
-public class LangPythonClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
-
-    public LangPythonClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) {
-        super(testCandidate);
-    }
-
-    @ParametersFactory
-    public static Iterable<Object[]> parameters() throws IOException, ClientYamlTestParseException {
-        return ESClientYamlSuiteTestCase.createParameters();
-    }
-}
-
diff --git a/plugins/lang-python/src/test/java/org/elasticsearch/script/python/PythonScriptEngineTests.java b/plugins/lang-python/src/test/java/org/elasticsearch/script/python/PythonScriptEngineTests.java
deleted file mode 100644
index f3bdd75a09a..00000000000
--- a/plugins/lang-python/src/test/java/org/elasticsearch/script/python/PythonScriptEngineTests.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.script.python;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.elasticsearch.common.collect.MapBuilder;
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.script.CompiledScript;
-import org.elasticsearch.script.ExecutableScript;
-import org.elasticsearch.script.ScriptType;
-import org.elasticsearch.test.ESTestCase;
-import org.junit.After;
-import org.junit.Before;
-
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.instanceOf;
-
-public class PythonScriptEngineTests extends ESTestCase {
-    private PythonScriptEngineService se;
-
-    @Before
-    public void setup() {
-        se = new PythonScriptEngineService(Settings.Builder.EMPTY_SETTINGS);
-    }
-
-    @After
-    public void close() {
-        se.close();
-    }
-
-    public void testSimpleEquation() {
-        Map<String, Object> vars = new HashMap<String, Object>();
-        Object o = se.executable(new CompiledScript(ScriptType.INLINE, "testSimpleEquation", "python", se.compile(null, "1 + 2", Collections.emptyMap())), vars).run();
-        assertThat(((Number) o).intValue(), equalTo(3));
-    }
-
-    @SuppressWarnings("unchecked")
-    public void testMapAccess() {
-        Map<String, Object> vars = new HashMap<String, Object>();
-
-        Map<String, Object> obj2 = MapBuilder.<String, Object>newMapBuilder().put("prop2", "value2").map();
-        Map<String, Object> obj1 = MapBuilder.<String, Object>newMapBuilder().put("prop1", "value1").put("obj2", obj2).put("l", Arrays.asList("2", "1")).map();
-        vars.put("obj1", obj1);
-        Object o = se.executable(new CompiledScript(ScriptType.INLINE, "testMapAccess", "python", se.compile(null, "obj1", Collections.emptyMap())), vars).run();
-        assertThat(o, instanceOf(Map.class));
-        obj1 = (Map<String, Object>) o;
-        assertThat((String) obj1.get("prop1"), equalTo("value1"));
-        assertThat((String) ((Map<String, Object>) obj1.get("obj2")).get("prop2"), equalTo("value2"));
-
-        o = se.executable(new CompiledScript(ScriptType.INLINE, "testMapAccess", "python", se.compile(null, "obj1['l'][0]", Collections.emptyMap())), vars).run();
-        assertThat(((String) o), equalTo("2"));
-    }
-
-    @SuppressWarnings("unchecked")
-    public void testObjectMapInter() {
-        Map<String, Object> vars = new HashMap<String, Object>();
-        Map<String, Object> ctx = new HashMap<String, Object>();
-        Map<String, Object> obj1 = new HashMap<String, Object>();
-        obj1.put("prop1", "value1");
-        ctx.put("obj1", obj1);
-        vars.put("ctx", ctx);
-
-        ExecutableScript executable = se.executable(new CompiledScript(ScriptType.INLINE, "testObjectInterMap", "python",
-                se.compile(null, "ctx['obj2'] = { 'prop2' : 'value2' }; ctx['obj1']['prop1'] = 'uvalue1'", Collections.emptyMap())), vars);
-        executable.run();
-        ctx = (Map<String, Object>) executable.unwrap(vars.get("ctx"));
-        assertThat(ctx.containsKey("obj1"), equalTo(true));
-        assertThat((String) ((Map<String, Object>) ctx.get("obj1")).get("prop1"), equalTo("uvalue1"));
-        assertThat(ctx.containsKey("obj2"), equalTo(true));
-        assertThat((String) ((Map<String, Object>) ctx.get("obj2")).get("prop2"), equalTo("value2"));
-    }
-
-    @SuppressWarnings("unchecked")
-    public void testAccessListInScript() {
-        Map<String, Object> vars = new HashMap<String, Object>();
-        Map<String, Object> obj2 = MapBuilder.<String, Object>newMapBuilder().put("prop2", "value2").map();
-        Map<String, Object> obj1 = MapBuilder.<String, Object>newMapBuilder().put("prop1", "value1").put("obj2", obj2).map();
-        vars.put("l", Arrays.asList("1", "2", "3", obj1));
-
-//        Object o = se.execute(se.compile("l.length"), vars);
-//        assertThat(((Number) o).intValue(), equalTo(4));
-
-        Object o = se.executable(new CompiledScript(ScriptType.INLINE, "testAccessListInScript", "python", se.compile(null, "l[0]", Collections.emptyMap())), vars).run();
-        assertThat(((String) o), equalTo("1"));
-
-        o = se.executable(new CompiledScript(ScriptType.INLINE, "testAccessListInScript", "python", se.compile(null, "l[3]", Collections.emptyMap())), vars).run();
-        obj1 = (Map<String, Object>) o;
-        assertThat((String) obj1.get("prop1"), equalTo("value1"));
-        assertThat((String) ((Map<String, Object>) obj1.get("obj2")).get("prop2"), equalTo("value2"));
-
-        o = se.executable(new CompiledScript(ScriptType.INLINE, "testAccessListInScript", "python", se.compile(null, "l[3]['prop1']", Collections.emptyMap())), vars).run();
-        assertThat(((String) o), equalTo("value1"));
-    }
-
-    public void testChangingVarsCrossExecution1() {
-        Map<String, Object> vars = new HashMap<String, Object>();
-        Map<String, Object> ctx = new HashMap<String, Object>();
-        vars.put("ctx", ctx);
-        Object compiledScript = se.compile(null, "ctx['value']", Collections.emptyMap());
-
-        ExecutableScript script = se.executable(new CompiledScript(ScriptType.INLINE, "testChangingVarsCrossExecution1", "python", compiledScript), vars);
-        ctx.put("value", 1);
-        Object o = script.run();
-        assertThat(((Number) o).intValue(), equalTo(1));
-
-        ctx.put("value", 2);
-        o = script.run();
-        assertThat(((Number) o).intValue(), equalTo(2));
-    }
-
-    public void testChangingVarsCrossExecution2() {
-        Map<String, Object> vars = new HashMap<String, Object>();
-        Map<String, Object> ctx = new HashMap<String, Object>();
-        Object compiledScript = se.compile(null, "value", Collections.emptyMap());
-
-        ExecutableScript script = se.executable(new CompiledScript(ScriptType.INLINE, "testChangingVarsCrossExecution2", "python", compiledScript), vars);
-        script.setNextVar("value", 1);
-        Object o = script.run();
-        assertThat(((Number) o).intValue(), equalTo(1));
-
-        script.setNextVar("value", 2);
-        o = script.run();
-        assertThat(((Number) o).intValue(), equalTo(2));
-    }
-}
diff --git a/plugins/lang-python/src/test/java/org/elasticsearch/script/python/PythonScriptMultiThreadedTests.java b/plugins/lang-python/src/test/java/org/elasticsearch/script/python/PythonScriptMultiThreadedTests.java
deleted file mode 100644
index 940a66b43a5..00000000000
--- a/plugins/lang-python/src/test/java/org/elasticsearch/script/python/PythonScriptMultiThreadedTests.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.script.python;
-
-import org.elasticsearch.common.Randomness;
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.script.CompiledScript;
-import org.elasticsearch.script.ExecutableScript;
-import org.elasticsearch.script.ScriptType;
-import org.elasticsearch.test.ESTestCase;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.CyclicBarrier;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import static org.hamcrest.Matchers.equalTo;
-
-public class PythonScriptMultiThreadedTests extends ESTestCase {
-
-    public void testExecutableNoRuntimeParams() throws Exception {
-        final PythonScriptEngineService se = new PythonScriptEngineService(Settings.Builder.EMPTY_SETTINGS);
-        final Object compiled = se.compile(null, "x + y", Collections.emptyMap());
-        final CompiledScript compiledScript = new CompiledScript(ScriptType.INLINE, "testExecutableNoRuntimeParams", "python", compiled);
-        final AtomicBoolean failed = new AtomicBoolean();
-
-        Thread[] threads = new Thread[4];
-        final CountDownLatch latch = new CountDownLatch(threads.length);
-        final CyclicBarrier barrier = new CyclicBarrier(threads.length + 1);
-        for (int i = 0; i < threads.length; i++) {
-            threads[i] = new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        barrier.await();
-                        long x = Randomness.get().nextInt();
-                        long y = Randomness.get().nextInt();
-                        long addition = x + y;
-                        Map<String, Object> vars = new HashMap<String, Object>();
-                        vars.put("x", x);
-                        vars.put("y", y);
-                        ExecutableScript script = se.executable(compiledScript, vars);
-                        for (int i = 0; i < 10000; i++) {
-                            long result = ((Number) script.run()).longValue();
-                            assertThat(result, equalTo(addition));
-                        }
-                    } catch (Exception e) {
-                        failed.set(true);
-                        logger.error("failed", e);
-                    } finally {
-                        latch.countDown();
-                    }
-                }
-            });
-        }
-        for (int i = 0; i < threads.length; i++) {
-            threads[i].start();
-        }
-        barrier.await();
-        latch.await();
-        assertThat(failed.get(), equalTo(false));
-    }
-
-
-//    public void testExecutableWithRuntimeParams() throws Exception {
-//        final PythonScriptEngineService se = new PythonScriptEngineService(Settings.Builder.EMPTY_SETTINGS);
-//        final Object compiled = se.compile("x + y");
-//        final AtomicBoolean failed = new AtomicBoolean();
-//
-//        Thread[] threads = new Thread[50];
-//        final CountDownLatch latch = new CountDownLatch(threads.length);
-//        final CyclicBarrier barrier = new CyclicBarrier(threads.length + 1);
-//        for (int i = 0; i < threads.length; i++) {
-//            threads[i] = new Thread(new Runnable() {
-//                @Override public void run() {
-//                    try {
-//                        barrier.await();
-//                        long x = Randomness.get().nextInt();
-//                        Map<String, Object> vars = new HashMap<String, Object>();
-//                        vars.put("x", x);
-//                        ExecutableScript script = se.executable(compiled, vars);
-//                        Map<String, Object> runtimeVars = new HashMap<String, Object>();
-//                        for (int i = 0; i < 100000; i++) {
-//                            long y = Randomness.get().nextInt();
-//                            long addition = x + y;
-//                            runtimeVars.put("y", y);
-//                            long result = ((Number) script.run(runtimeVars)).longValue();
-//                            assertThat(result, equalTo(addition));
-//                        }
-//                    } catch (Exception e) {
-//                        failed.set(true);
-//                        logger.error("failed", e);
-//                    } finally {
-//                        latch.countDown();
-//                    }
-//                }
-//            });
-//        }
-//        for (int i = 0; i < threads.length; i++) {
-//            threads[i].start();
-//        }
-//        barrier.await();
-//        latch.await();
-//        assertThat(failed.get(), equalTo(false));
-//    }
-
-    public void testExecute() throws Exception {
-        final PythonScriptEngineService se = new PythonScriptEngineService(Settings.Builder.EMPTY_SETTINGS);
-        final Object compiled = se.compile(null, "x + y", Collections.emptyMap());
-        final CompiledScript compiledScript = new CompiledScript(ScriptType.INLINE, "testExecute", "python", compiled);
-        final AtomicBoolean failed = new AtomicBoolean();
-
-        Thread[] threads = new Thread[4];
-        final CountDownLatch latch = new CountDownLatch(threads.length);
-        final CyclicBarrier barrier = new CyclicBarrier(threads.length + 1);
-        for (int i = 0; i < threads.length; i++) {
-            threads[i] = new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        barrier.await();
-                        Map<String, Object> runtimeVars = new HashMap<String, Object>();
-                        for (int i = 0; i < 10000; i++) {
-                            long x = Randomness.get().nextInt();
-                            long y = Randomness.get().nextInt();
-                            long addition = x + y;
-                            runtimeVars.put("x", x);
-                            runtimeVars.put("y", y);
-                            long result = ((Number) se.executable(compiledScript, runtimeVars).run()).longValue();
-                            assertThat(result, equalTo(addition));
-                        }
-                    } catch (Exception e) {
-                        failed.set(true);
-                        logger.error("failed", e);
-                    } finally {
-                        latch.countDown();
-                    }
-                }
-            });
-        }
-        for (int i = 0; i < threads.length; i++) {
-            threads[i].start();
-        }
-        barrier.await();
-        latch.await();
-        assertThat(failed.get(), equalTo(false));
-    }
-}
diff --git a/plugins/lang-python/src/test/java/org/elasticsearch/script/python/PythonSecurityTests.java b/plugins/lang-python/src/test/java/org/elasticsearch/script/python/PythonSecurityTests.java
deleted file mode 100644
index 262783dc00c..00000000000
--- a/plugins/lang-python/src/test/java/org/elasticsearch/script/python/PythonSecurityTests.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.script.python;
-
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.script.CompiledScript;
-import org.elasticsearch.script.ScriptType;
-import org.elasticsearch.test.ESTestCase;
-import org.python.core.PyException;
-
-import java.text.DecimalFormatSymbols;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-/**
- * Tests for Python security permissions
- */
-public class PythonSecurityTests extends ESTestCase {
-
-    private PythonScriptEngineService se;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        se = new PythonScriptEngineService(Settings.Builder.EMPTY_SETTINGS);
-        // otherwise will exit your VM and other bad stuff
-        assumeTrue("test requires security manager to be enabled", System.getSecurityManager() != null);
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-        se.close();
-        super.tearDown();
-    }
-
-    /** runs a script */
-    private void doTest(String script) {
-        Map<String, Object> vars = new HashMap<String, Object>();
-        se.executable(new CompiledScript(ScriptType.INLINE, "test", "python", se.compile(null, script, Collections.emptyMap())), vars).run();
-    }
-
-    /** asserts that a script runs without exception */
-    private void assertSuccess(String script) {
-        doTest(script);
-    }
-
-    /** assert that a security exception is hit */
-    private void assertFailure(String script) {
-        try {
-            doTest(script);
-            fail("did not get expected exception");
-        } catch (PyException expected) {
-            // TODO: fix jython localization bugs: https://github.com/elastic/elasticsearch/issues/13967
-            // we do a gross hack for now
-            DecimalFormatSymbols symbols = DecimalFormatSymbols.getInstance(Locale.getDefault());
-            if (symbols.getZeroDigit() == '0') {
-                assertTrue(expected.toString().contains("cannot import"));
-            }
-        }
-    }
-
-    /** Test some py scripts that are ok */
-    public void testOK() {
-        assertSuccess("1 + 2");
-        assertSuccess("from java.lang import Math\nMath.cos(0)");
-        assertSuccess("map(lambda x: x + 1, range(100))");
-    }
-
-    /** Test some py scripts that should hit security exception */
-    public void testNotOK() {
-        // sanity check :)
-        assertFailure("from java.lang import Runtime\nRuntime.getRuntime().halt(0)");
-        // check a few things more restrictive than the ordinary policy
-        // no network
-        assertFailure("from java.net import Socket\nSocket(\"localhost\", 1024)");
-        // no files
-        assertFailure("from java.io import File\nFile.createTempFile(\"test\", \"tmp\")");
-    }
-
-    /** Test again from a new thread, python has complex threadlocal configuration */
-    public void testNotOKFromSeparateThread() throws Exception {
-        Thread t = new Thread() {
-            @Override
-            public void run() {
-                assertFailure("from java.lang import Runtime\nRuntime.availableProcessors()");
-            }
-        };
-        t.start();
-        t.join();
-    }
-}
diff --git a/plugins/lang-python/src/test/resources/rest-api-spec/test/lang_python/10_basic.yaml b/plugins/lang-python/src/test/resources/rest-api-spec/test/lang_python/10_basic.yaml
deleted file mode 100644
index c915411f1d4..00000000000
--- a/plugins/lang-python/src/test/resources/rest-api-spec/test/lang_python/10_basic.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Integration tests for Lang Python components
-#
-setup:
-    - do:
-        index:
-            index: test
-            type: test
-            id: 1
-            body: { "foo": "aaa" }
-    - do:
-        indices.refresh: {}
-
----
-
-"Lang Python":
-    - do:
-        search:
-            body:
-                script_fields:
-                    bar:
-                        script: 
-                            inline: "doc['foo.keyword'].value + x"
-                            lang: python
-                            params:
-                                x: "bbb"
-
-    - match: { hits.hits.0.fields.bar.0: "aaabbb"}
diff --git a/plugins/lang-python/src/test/resources/rest-api-spec/test/lang_python/20_search.yaml b/plugins/lang-python/src/test/resources/rest-api-spec/test/lang_python/20_search.yaml
deleted file mode 100644
index b0f18e17748..00000000000
--- a/plugins/lang-python/src/test/resources/rest-api-spec/test/lang_python/20_search.yaml
+++ /dev/null
@@ -1,345 +0,0 @@
-# Integration tests for Lang Python components
-#
-"Python Query":
-    - do:
-        index:
-            index: test
-            type: test
-            id: 1
-            body: { "test": "value beck", "num1": 1.0 }
-    - do:
-        index:
-            index: test
-            type: test
-            id: 2
-            body: { "test": "value beck", "num1": 2.0 }
-    - do:
-        index:
-            index: test
-            type: test
-            id: 3
-            body: { "test": "value beck", "num1": 3.0 }
-    - do:
-        indices.refresh: {}
-
-    - do:
-        index: test
-        search:
-            body:
-                query:
-                    script:
-                        script:
-                            inline: "doc['num1'].value > 1"
-                            lang: python
-                script_fields:
-                    sNum1:
-                        script: 
-                            inline: "doc['num1'].value"
-                            lang: python
-                sort:
-                    num1:
-                        order: asc
-
-    - match: { hits.total: 2 }
-    - match: { hits.hits.0.fields.sNum1.0: 2.0 }
-    - match: { hits.hits.1.fields.sNum1.0: 3.0 }
-
-    - do:
-        index: test
-        search:
-            body:
-                query:
-                    script:
-                        script:
-                            inline: "doc['num1'].value > param1"
-                            lang: python
-                            params:
-                                param1: 1
-
-                script_fields:
-                    sNum1:
-                        script: 
-                            inline: "doc['num1'].value"
-                            lang: python
-                sort:
-                    num1:
-                        order: asc
-
-    - match: { hits.total: 2 }
-    - match: { hits.hits.0.fields.sNum1.0: 2.0 }
-    - match: { hits.hits.1.fields.sNum1.0: 3.0 }
-
-    - do:
-        index: test
-        search:
-            body:
-                query:
-                    script:
-                        script:
-                            inline: "doc['num1'].value > param1"
-                            lang: python
-                            params:
-                                param1: -1
-
-                script_fields:
-                    sNum1:
-                        script: 
-                            inline: "doc['num1'].value"
-                            lang: python
-                sort:
-                    num1:
-                        order: asc
-
-    - match: { hits.total: 3 }
-    - match: { hits.hits.0.fields.sNum1.0: 1.0 }
-    - match: { hits.hits.1.fields.sNum1.0: 2.0 }
-    - match: { hits.hits.2.fields.sNum1.0: 3.0 }
-
-
----
-
-"Python Script Field Using Source":
-    - do:
-        index:
-            index: test
-            type: test
-            id: 1
-            body: {
-              "obj1": {
-                "test": "something"
-              },
-              "obj2": {
-                "arr2": [ "arr_value1", "arr_value2" ]
-              }
-            }
-    - do:
-        indices.refresh: {}
-
-    - do:
-        index: test
-        search:
-            body:
-                script_fields:
-                    s_obj1:
-                        script: 
-                            inline: "_source['obj1']"
-                            lang: python
-                    s_obj1_test:
-                        script: 
-                            inline: "_source['obj1']['test']"
-                            lang: python
-                    s_obj2:
-                        script: 
-                            inline: "_source['obj2']"
-                            lang: python
-                    s_obj2_arr2:
-                        script: 
-                            inline: "_source['obj2']['arr2']"
-                            lang: python
-
-    - match: { hits.total: 1 }
-    - match: { hits.hits.0.fields.s_obj1.0.test: something }
-    - match: { hits.hits.0.fields.s_obj1_test.0: something }
-    - match: { hits.hits.0.fields.s_obj2.0.arr2.0: arr_value1 }
-    - match: { hits.hits.0.fields.s_obj2.0.arr2.1: arr_value2 }
-    - match: { hits.hits.0.fields.s_obj2_arr2.0: arr_value1 }
-    - match: { hits.hits.0.fields.s_obj2_arr2.1: arr_value2 }
-
----
-
-"Python Custom Script Boost":
-    - do:
-        index:
-            index: test
-            type: test
-            id: 1
-            body: { "test": "value beck", "num1": 1.0 }
-    - do:
-        index:
-            index: test
-            type: test
-            id: 2
-            body: { "test": "value beck", "num1": 2.0 }
-    - do:
-        indices.refresh: {}
-
-    - do:
-        index: test
-        search:
-            body:
-                query:
-                    function_score:
-                        query:
-                            term:
-                                test: value
-                        "functions": [{
-                            "script_score": {
-                                "script": {
-                                    "lang": "python",
-                                    "inline": "doc['num1'].value"
-                                }
-                            }
-                        }]
-
-    - match: { hits.total: 2 }
-    - match: { hits.hits.0._id: "2" }
-    - match: { hits.hits.1._id: "1" }
-
-    - do:
-        index: test
-        search:
-            body:
-                query:
-                    function_score:
-                        query:
-                            term:
-                                test: value
-                        "functions": [{
-                            "script_score": {
-                                "script": {
-                                    "lang": "python",
-                                    "inline": "-doc['num1'].value"
-                                }
-                            }
-                        }]
-
-    - match: { hits.total: 2 }
-    - match: { hits.hits.0._id: "1" }
-    - match: { hits.hits.1._id: "2" }
-
-    - do:
-        index: test
-        search:
-            body:
-                query:
-                    function_score:
-                        query:
-                            term:
-                                test: value
-                        "functions": [{
-                            "script_score": {
-                                "script": {
-                                    "lang": "python",
-                                    "inline": "doc['num1'].value * _score.doubleValue()"
-                                }
-                            }
-                        }]
-
-    - match: { hits.total: 2 }
-    - match: { hits.hits.0._id: "2" }
-    - match: { hits.hits.1._id: "1" }
-
-    - do:
-        index: test
-        search:
-            body:
-                query:
-                    function_score:
-                        query:
-                            term:
-                                test: value
-                        "functions": [{
-                            "script_score": {
-                                "script": {
-                                    "lang": "python",
-                                    "inline": "param1 * param2 * _score.doubleValue()",
-                                    "params": {
-                                        "param1": 2,
-                                        "param2": 2
-
-                                    }
-                                }
-                            }
-                        }]
-
-    - match: { hits.total: 2 }
-
----
-
-"Python Scores Nested":
-    - do:
-        index:
-            index: test
-            type: test
-            id: 1
-            body: { "dummy_field": 1 }
-    - do:
-        indices.refresh: {}
-
-    - do:
-        index: test
-        search:
-            body:
-                query:
-                    function_score:
-                        query:
-                            function_score:
-                                "functions": [
-                                    {
-                                        "script_score": {
-                                            "script": {
-                                                "lang": "python",
-                                                "inline": "1"
-                                            }
-                                        }
-                                    }, {
-                                        "script_score": {
-                                            "script": {
-                                                "lang": "python",
-                                                "inline": "_score.doubleValue()"
-                                            }
-                                        }
-                                    }
-                                ]
-                        "functions": [{
-                            "script_score": {
-                                "script": {
-                                    "lang": "python",
-                                    "inline": "_score.doubleValue()"
-                                }
-                            }
-                        }]
-
-    - match: { hits.total: 1 }
-    - match: { hits.hits.0._score: 1.0 }
-
-
----
-
-"Python Scores With Agg":
-    - do:
-        index:
-            index: test
-            type: test
-            id: 1
-            body: { "dummy_field": 1 }
-    - do:
-        indices.refresh: {}
-
-
-    - do:
-        index: test
-        search:
-            body:
-                query:
-                    function_score:
-                        "functions": [{
-                            "script_score": {
-                                "script": {
-                                    "lang": "python",
-                                    "inline": "_score.doubleValue()"
-                                }
-                            }
-                        }]
-                aggs:
-                    score_agg:
-                        terms:
-                            script:
-                                lang: python
-                                inline: "_score.doubleValue()"
-
-    - match: { hits.total: 1 }
-    - match: { hits.hits.0._score: 1.0 }
-    - match: { aggregations.score_agg.buckets.0.key: "1.0" }
-    - match: { aggregations.score_agg.buckets.0.doc_count: 1 }
-
diff --git a/plugins/lang-python/src/test/resources/rest-api-spec/test/lang_python/30_update.yaml b/plugins/lang-python/src/test/resources/rest-api-spec/test/lang_python/30_update.yaml
deleted file mode 100644
index fc5dcba8bcb..00000000000
--- a/plugins/lang-python/src/test/resources/rest-api-spec/test/lang_python/30_update.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-# Integration tests for Lang Python components
-#
-
-# Test case for #4: https://github.com/elastic/elasticsearch-lang-python/issues/4
-# Update request that uses python script with no parameters fails with NullPointerException
-#
-"Python Update With Empty Parameters":
-    - do:
-        index:
-            index: test
-            type: test
-            id: 1
-            body: { "myfield": "foo" }
-    - do:
-        update:
-            index: test
-            type: test
-            id: 1
-            body:
-                script:
-                    inline: "ctx[\"_source\"][\"myfield\"]=\"bar\""
-                    lang: python
-    - do:
-        get:
-            index: test
-            type: test
-            id: 1
-
-    - match: { _source.myfield: "bar" }
-
----
-
-# Test case for #19: https://github.com/elastic/elasticsearch-lang-python/issues/19
-# Multi-line or multi-statement Python scripts raise NullPointerException
-#
-"Python Update With Multi Lines":
-    - do:
-        index:
-            index: test
-            type: test
-            id: 1
-            body: { "myfield": "foo" }
-    - do:
-        update:
-            index: test
-            type: test
-            id: 1
-            body:
-                script:
-                    inline: "a=42; ctx[\"_source\"][\"myfield\"]=\"bar\""
-                    lang: python
-    - do:
-        get:
-            index: test
-            type: test
-            id: 1
-
-    - match: { _source.myfield: "bar" }
-
diff --git a/qa/evil-tests/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java b/qa/evil-tests/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java
index 3bed3350f0f..08ce0083ec2 100644
--- a/qa/evil-tests/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java
+++ b/qa/evil-tests/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java
@@ -477,6 +477,34 @@ public class InstallPluginCommandTests extends ESTestCase {
         }
     }
 
+    public void testPlatformBinPermissions() throws Exception {
+        assumeTrue("posix filesystem", isPosix);
+        Tuple<Path, Environment> env = createEnv(fs, temp);
+        Path pluginDir = createPluginDir(temp);
+        Path platformDir = pluginDir.resolve("platform");
+        Path platformNameDir = platformDir.resolve("linux-x86_64");
+        Path platformBinDir = platformNameDir.resolve("bin");
+        Files.createDirectories(platformBinDir);
+        Path programFile = Files.createFile(platformBinDir.resolve("someprogram"));
+        // a file created with Files.createFile() should not have execute permissions
+        Set<PosixFilePermission> sourcePerms = Files.getPosixFilePermissions(programFile);
+        assertFalse(sourcePerms.contains(PosixFilePermission.OWNER_EXECUTE));
+        assertFalse(sourcePerms.contains(PosixFilePermission.GROUP_EXECUTE));
+        assertFalse(sourcePerms.contains(PosixFilePermission.OTHERS_EXECUTE));
+        String pluginZip = createPlugin("fake", pluginDir);
+        installPlugin(pluginZip, env.v1());
+        assertPlugin("fake", pluginDir, env.v2());
+        // check that the installed program has execute permissions, even though the one added to the plugin didn't
+        Path installedPlatformBinDir = env.v2().pluginsFile().resolve("fake").resolve("platform").resolve("linux-x86_64").resolve("bin");
+        assertTrue(Files.isDirectory(installedPlatformBinDir));
+        Path installedProgramFile = installedPlatformBinDir.resolve("someprogram");
+        assertTrue(Files.isRegularFile(installedProgramFile));
+        Set<PosixFilePermission> installedPerms = Files.getPosixFilePermissions(installedProgramFile);
+        assertTrue(installedPerms.contains(PosixFilePermission.OWNER_EXECUTE));
+        assertTrue(installedPerms.contains(PosixFilePermission.GROUP_EXECUTE));
+        assertTrue(installedPerms.contains(PosixFilePermission.OTHERS_EXECUTE));
+    }
+
     public void testConfig() throws Exception {
         Tuple<Path, Environment> env = createEnv(fs, temp);
         Path pluginDir = createPluginDir(temp);
diff --git a/qa/no-bootstrap-tests/src/test/java/org/elasticsearch/bootstrap/SpawnerNoBootstrapTests.java b/qa/no-bootstrap-tests/src/test/java/org/elasticsearch/bootstrap/SpawnerNoBootstrapTests.java
index 5e08696ebf3..d1556d02758 100644
--- a/qa/no-bootstrap-tests/src/test/java/org/elasticsearch/bootstrap/SpawnerNoBootstrapTests.java
+++ b/qa/no-bootstrap-tests/src/test/java/org/elasticsearch/bootstrap/SpawnerNoBootstrapTests.java
@@ -51,6 +51,30 @@ public class SpawnerNoBootstrapTests extends LuceneTestCase {
             + "\n"
             + "read SOMETHING\n";
 
+    /**
+     * Simplest case: a plugin with no controller daemon.
+     */
+    public void testNoControllerSpawn() throws IOException, InterruptedException {
+        Path esHome = createTempDir().resolve("esHome");
+        Settings.Builder settingsBuilder = Settings.builder();
+        settingsBuilder.put(Environment.PATH_HOME_SETTING.getKey(), esHome.toString());
+        Settings settings = settingsBuilder.build();
+
+        Environment environment = new Environment(settings);
+
+        // This plugin will NOT have a controller daemon
+        Path plugin = environment.pluginsFile().resolve("a_plugin");
+        Files.createDirectories(plugin);
+
+        try (Spawner spawner = new Spawner()) {
+            spawner.spawnNativePluginControllers(environment);
+            assertTrue(spawner.getProcesses().isEmpty());
+        }
+    }
+
+    /**
+     * Two plugins - one with a controller daemon and one without.
+     */
     public void testControllerSpawn() throws IOException, InterruptedException {
         // On Windows you cannot directly run a batch file - you have to run cmd.exe with the batch file
         // as an argument and that's out of the remit of the controller daemon process spawner.  If
diff --git a/qa/vagrant/src/test/resources/packaging/tests/module_and_plugin_test_cases.bash b/qa/vagrant/src/test/resources/packaging/tests/module_and_plugin_test_cases.bash
index d27953cb49e..b37cb7af5ef 100644
--- a/qa/vagrant/src/test/resources/packaging/tests/module_and_plugin_test_cases.bash
+++ b/qa/vagrant/src/test/resources/packaging/tests/module_and_plugin_test_cases.bash
@@ -267,14 +267,6 @@ fi
     check_secure_module lang-painless antlr4-runtime-*.jar asm-debug-all-*.jar
 }
 
-@test "[$GROUP] install javascript plugin" {
-    install_and_check_plugin lang javascript rhino-*.jar
-}
-
-@test "[$GROUP] install python plugin" {
-    install_and_check_plugin lang python jython-standalone-*.jar
-}
-
 @test "[$GROUP] install murmur3 mapper plugin" {
     install_and_check_plugin mapper murmur3
 }
@@ -381,14 +373,6 @@ fi
     remove_plugin ingest-user-agent
 }
 
-@test "[$GROUP] remove javascript plugin" {
-    remove_plugin lang-javascript
-}
-
-@test "[$GROUP] remove python plugin" {
-    remove_plugin lang-python
-}
-
 @test "[$GROUP] remove murmur3 mapper plugin" {
     remove_plugin mapper-murmur3
 }
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/80_date_math_index_names.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/80_date_math_index_names.yaml
deleted file mode 100644
index 2f2cf6ab982..00000000000
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/80_date_math_index_names.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-"Missing index with catch":
-
-  - do:
-      catch:   /logstash-\d{4}\.\d{2}\.\d{2}/
-      search:
-        index: <logstash-{now/M}>
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/80_indices_options.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/80_indices_options.yaml
new file mode 100644
index 00000000000..d3cb5dae846
--- /dev/null
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/80_indices_options.yaml
@@ -0,0 +1,63 @@
+---
+"Missing index date math with catch":
+
+  - do:
+      catch:   /logstash-\d{4}\.\d{2}\.\d{2}/
+      search:
+        index: <logstash-{now/M}>
+
+---
+"Missing index":
+
+  - do:
+      catch:   missing
+      search:
+        index: missing_index
+
+  - do:
+      search:
+        index: missing_index
+        ignore_unavailable: true
+
+  - match: {hits.total: 0}
+
+---
+"Closed index":
+
+  - do:
+      indices.create:
+          index:  index_closed
+
+  - do:
+      indices.close:
+          index:  index_closed
+
+  - do:
+      catch:  /index_closed_exception/
+      search:
+        index: index_closed
+
+  - do:
+      search:
+        index: index_closed
+        ignore_unavailable: true
+
+  - match: {hits.total: 0}
+
+  - do:
+      search:
+        index: index*
+
+  - match: {hits.total: 0}
+
+  - do:
+      catch: missing
+      search:
+        index: index*
+        allow_no_indices: false
+
+  - do:
+      catch:  /index_closed_exception/
+      search:
+        index: index*
+        expand_wildcards: ["open","closed"]
diff --git a/settings.gradle b/settings.gradle
index 5621bd4a232..db3078b3ea0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -44,8 +44,6 @@ List projects = [
   'plugins:ingest-geoip',
   'plugins:ingest-attachment',
   'plugins:ingest-user-agent',
-  'plugins:lang-javascript',
-  'plugins:lang-python',
   'plugins:mapper-murmur3',
   'plugins:mapper-size',
   'plugins:repository-azure',
diff --git a/test/framework/src/main/java/org/elasticsearch/test/TestCustomMetaData.java b/test/framework/src/main/java/org/elasticsearch/test/TestCustomMetaData.java
index 92d5b95cfac..a655f17faca 100644
--- a/test/framework/src/main/java/org/elasticsearch/test/TestCustomMetaData.java
+++ b/test/framework/src/main/java/org/elasticsearch/test/TestCustomMetaData.java
@@ -99,4 +99,9 @@ public abstract class TestCustomMetaData extends AbstractDiffable<MetaData.Custo
         builder.field("data", getData());
         return builder;
     }
+
+    @Override
+    public String toString() {
+        return "[" + type() + "][" + data +"]";
+    }
 }
diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCase.java
index cb46c278c2b..d44ce71decb 100644
--- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCase.java
+++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCase.java
@@ -68,7 +68,7 @@ public abstract class ESClientYamlSuiteTestCase extends ESRestTestCase {
     public static final String REST_TESTS_SUITE = "tests.rest.suite";
     /**
      * Property that allows to blacklist some of the REST tests based on a comma separated list of globs
-     * e.g. -Dtests.rest.blacklist=get/10_basic/*
+     * e.g. "-Dtests.rest.blacklist=get/10_basic/*"
      */
     public static final String REST_TESTS_BLACKLIST = "tests.rest.blacklist";
     /**