Merge "sdc persistence folder parametrization"