Implemented: https://issues.apache.org/activemq/browse/AMQ-2338 https://issues.apache.org/activemq/browse/AMQ-2337