Merge "Call sync() to guarantee blocks were released by unlink" into main