merge master into vcs-upd
vcsChangeInfo.Type
vcs tests init
merge vcs tests init
fix consumer