Merge branch 'master' into il/vcs-helper