Merge remote-tracking branch 'keystone/next'