Merge change 23077 into eclair

* changes:
  optimize MCC table