Merge "Replace .toList() with .collect()" into main