Adding a flag to be able to specify vtaction full path.
Merge branch 'master' into replication
Merge branch 'replication'