Merge "Support config update" into main