added wait_for_fs infrastructure