Merge "Respect user customization for implicit Zen rules" into main