Waiting for deleted directory FATAL_ERROR -> warning
Merge branch 'sync' into test-sync