Merge "Add test to ensure Zen logging enums stay up to date" into main