Merge branch 'master' into es_rest_api