Merge "Update the forEach() into for-loop" into main