Merge branch 'next', remote-tracking branch 'origin'