Merge "vid persistence folder parametrization"