[DF-1212] fix review issues (1361-1365)