DF-4614 - review comments