DEBUG: Working on QPID-5535