fix old es_cell functional test
Merge branch 'staging' into es_cell_attributes