Attempt to deal with missing segment file.
Merged bug25576 into stable
Merged stable into default