Changes made in branch 'next'