Merge "Don't use Config as an access method for global objects"