WS: changes to analytics parts
 Please enter the commit message for your changes. Lines starting