Merge branch `next'