[DF-1520] fix review issues: ref. managment(1689-1693)