[DF-2672] Additional comments.