Merge "Replace LinkedList by a more performant collection"