Merge "Fix timeouts caused by destroy() waiting for the same lock on sort."