Fixing stats faceting for 1.2 (and backward compatible w/ 0.90)
Merge branch 'csg/es-1.2' into csg/stable-v2-final