Additionally this commit contains a conversion from %d to %s in a query [MAILPOET-4219]
[MAILPOET-4219]
[MAILPOET-3988]