PRD-5143 - Golden sample update.
Merge pull request #433 from tmorgner/PRD-5143-2

PRD-5143 - Golden sample update.
Merge remote-tracking branch 'upstream/master'