Merge commit 'jwb/next' into merge