Backport HORNETQ-431