backup data following 10.04 crash
ReCommit changes from backup following 10.04 crash