Hella merging.
Merge remote-tracking branch 'origin/scope-rewrite' into scope-rewrite