Merge branch 'reject-ptr-scalar-mix'