[DF-4204] Restored code that removed while merge