DF-4513 - updated according to review comment.