Make sure RRD data is restored from backup before upgrading data and a new backup is done after. It should fix #2159