Merge in RED/persistence-service from RED-2256-ps1 to master * commit 'f48f2994b685b014938b7e8a4c54c156ec08582f':