Mostly a stripped-down version of !115. Prepared so I can deploy at MID. At the time of writing, they haven't responded with "go", but just in case, here are the changes made visible.
For actually merging something someday, we should decide on !115