DF-4960 - review comments.