Case 21641; Added patch to nodequeue