MERGE More config changes