Merge "Remove ListUtils duplicate" into main