Changes to be in line with 2.0.0 backup expecations.