Merge change 7956 into donut

* changes:
  Moving compatibilty mode option to spare parts