Merge in RED/persistence-service from bugfix/RED-2772 to master * commit '733cdd4f76f672b6d0723e3cc2a72132cf78bb34': RED-2772
Merge in RED/persistence-service from bugfix/RED-2772 to master * commit '733cdd4f76f672b6d0723e3cc2a72132cf78bb34': RED-2772