Forward VTK to 'gerrit/master'

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

3914b289 Forward VTK to 'gerrit/master'