CDB-1198 #resolve Analytics update