DF-3516 - updated according to review comments