Merge "Replace AConfig() with Config()" into main