DF-5036 - review comments.