Merge "Synchronize updates to zen config."