Forward VTK to 'gerrit/master'

Change-Id: I169a65fbe5f8288be0372ff59339a6bdbafb3d5d
Merge topic 'composite-data-display-attributes' into next

234062a Forward VTK to 'gerrit/master'