Merge "Fix duplicate automatic file backend bug"