Merge remote-tracking branch 'earl/tor' into next