Merge branch 'next' into sam_libcxx
Merge branch 'sam_libcxx' into sam_no_ptr_bag