Github user mtaylor commented on the issue: https://github.com/apache/activemq-artemis/pull/2119 @clebertsuconic Feel free to squash the commits once I've updated with @michaelandrepearce feedback. I don't really care. However, cherry-picking should be straight forward, since both commits have the JIRA, and this PR with the commits is also posted in the JIRA. ---