Dist

Note that this PR is being send to the `unstable` branch, since I don't want to derail bug bashing for the upcoming deadline.

See the individual commit messages for more details.

This PR needs some corresponding changes to the dashboard, which I will make soon.