Merge branch 'hv/sample-update'