Merge branch `next'

Merge branch `next'