merged pydy-viz from 8449005