Merge branch 'sam_alt' into next
Merge branch 'next' into sam_alt_assert