Reapply slots changes (any future slots hotfixes should happen on main and then get merged in to this)