Merge "Add new zen rules to config"