BACKLOG-4730: Avoid ConstraintViolationException