Merge branch 'sam_1427' into next
Merge branch 'next' into sam_1426