Merge branch 'il/vcs-helper'