Merge change 23193 into eclair

* changes:
  Expand indirect reference ifdefs.