Merge "Add comments about TODO Bug 347083680" into main