[DF-2762] Intermediate changes.
[DF-2672] Additional comments.