Merge branch 'sam-work'