Merge "Fix indexoutofbounds in Folder" into main