Merge "Fix deep copy of entry queue"