Merge "Revert "Change the visibility of Config to be public, so it can be accessed from"" into main