Merge branch 'next' into sam_1903
Merge branch 'next' into sam_alt