Forward VTK to 'gerrit/master'

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

e44190b Forward VTK to 'gerrit/master'