Merge "Remove rename automatic zen rule."