Merge "Return correct config from getActiveConfig()"