Merge "Add compatibility change preference"