current state of value based analytics #191
(cherry picked from commit d3f8de02d0bc6fe6a811e6112c7c8e5cf5b1f431)