Fixes to reset_to_default()
- Conditionally update setup_consumers
- Add a 5.7 specific verison, as setup_objects has more objects within it