am b2d4f431: Merge change 7956 into donut

Merge commit 'b2d4f431b9cc2436e808253e87e62b918970ac53'

* commit 'b2d4f431b9cc2436e808253e87e62b918970ac53':
  Moving compatibilty mode option to spare parts