I just finished fixing all specs to make the build green. We should be able to merge this one tomorrow when Keegan gets back 
I don’t see a big upside since migrating the setting values is relatively simple and we are still keeping the old setting around (but hidden). Having said that, I’m not against it if we want to be extra safe. It’s up to @keegan.