Merge "Ensure the target sees a proper EOD marker during restore" into nyc-mr1-dev