DF-4546 - review comments.