[DF-1483], [DF-1486] are fixed - Code Review.