[DF-1849] Refactored by [DF-1865]