RED-7237 - Change to group annotation Closes RED-7327 See merge request redactmanager/persistence-service!686