Support alternate close error on Queue
Merge masters