Merge remote-tracking branch 'devel/img_diff_from_vtk'