[NX-78] analytics
Merge branch 'master' into application-directories
update analytics to use ApplicationDirectories