Merge "Remove usage of Stream.toList()" into main