Merge master in legacy

And we're back!