HORNETQ-1337 and a few other commits