[no changelog]
[no changelog] Mixins are now named after what they do, and mixins for the same class that do different things should be in two separate mixins now.