merge origin/master zooming segm fixed