Merge "Updating backup restore logic" into ub-now-queens