DF-4708 - review comments