Config update after merges.