Merge branch 'db/vcs-helper'