[DF-1093] [DF-1094] merged