Merge branch 'vb/df'