Merge "Adding extensions for backup restore test" into main