@janl Issue to track here -- it actually merged cleanly with 4.0 so I will probably make a PR upstream and see what happens github.com/mastodon/mastodon/i