merged to latest qpid