Merge "message-router persistence folder parametrization"