Merge change 8036 into donut

* changes:
  * Disable compatibility mode for all cases.