Merges work done by vis team

@jonnymanf @nicola