Merge remote branch 'jwb/next' into next