DF-5127 - review comments.