[DF-None] Hotfix after merge.