BZ-12137: Chnages to fix issue with total ECMS savings