Reapplying  "HORNETQ-1242 :" (revert of the revert)

This reverts commit 5798aa3fc694cd30099da5a3c18fbfbddac1cc16.