Issue #6934 Analytics support added