HORNETQ-1218 and a requested change from QE