Merge "appc persistence folder parametrization"