DF-4245 - review comments.