ADEN-1153 DR for IVW2 Analytics Provider refactoring