DF-3694 - review comments