Merge "[dovetail] Bugfix: incorrectly exit when file doesn't exist"