Merge "Log the user-modified fields of Zen Rules" into main