Merge "Fix default zen config to be up to date according to enabled flags" into main