Merge branch 't/gvf'