branch to branch merge of ElasticContext.cpp +recent master updates