Merge "Fix config loading in CTS"