BZ-12426:Improvements to Updating Finance and Savings Estimates