Forward VTK to gerrit/master

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

3bd2996 Forward VTK to gerrit/master