Merged analytics/as7 and analytics/impl modules