[DF-5185], [DF-5170] fix review comment