Merge remote-tracking branch 'origin/pv162_watershed_new_visualization' into pv162_watershed_new_visualization