Changed comment
Retry if refine complains that the file disappears.
Merge branch '4.0_maintenance' into dev