HORNETQ-1130 and a few small changes (like a test fix)