Address review feedback & added samples code:
- #2945