fat: dir: Merge oppo changes