Fixed merge conflicts

8 jobs for def_reset_zoom in 0 seconds (queued for 80 minutes and 59 seconds)
latest