Forward VTK to gerrit/master

Change-Id: I437c48bea8819077230fe35019fb17d9f028cbcb
Merge topic 'forward-to-vtk-master' into next

b16d5cb Forward VTK to gerrit/master