Merge branch 'SAMOA-6'