Revert "Revert "Merge branch 'next'""

This reverts commit a9f4d2185cd628a1fc55a3c1e441a7b15b7507f5.