Merge branch 'sam_803' into next