XD-907: Add aggregate counter year resolution