Merge branch 'next' into sam_page_ptr
Merge branch 'sam_page_ptr' into sam_2053