Merge remote-tracking branch 'scott/next' into next