Merge "Limit ravenwood related module visibilities" into main