commit samantha integration
Merge branch 'feature/samantha' into dev