BZ-12149: changes to fix issues opening old savings estimates