The title says pretty much all
Tagging @eballabe, @alsala, @shion and @ckawamot
Keeping in draft to allow for confirmation clients are happy with these changes