Merge branch 'new_zoom_buttons_panel'