Merge in RED/persistence-service from flag-calculation to master * commit 'f9f94389b7ce33e5213ee3c476bd3ee7837dfe65': flag calculations critical fix
Merge in RED/persistence-service from flag-calculation to master * commit 'f9f94389b7ce33e5213ee3c476bd3ee7837dfe65': flag calculations critical fix