Merge branch 'next' into sam_2767
Merge branch 'sam_2767' into next
Merge branch 'next' into sam_2156