Merge branch 'db/vcs-helper' (early part) into next