Merge change 21537 into eclair

* changes:
  really be more friendly with C