Merge "Fix visibility of some modules" into main