RF-12860: sample updated according to comments from David Lee