back port HORNETQ-1406 from master