Merge "Reconstruct the containers from the saved state" into main