Merge from backup. Fixed backup restore issues