Merge remote-tracking branch 'allan/working-split/vcs'