Merge change 3689 into donut

* changes:
  CompatibilityMode settings