Merge branch '1680_exit_on_non_local_vfs'