Merge change 26339 into eclair

* changes:
  Split sources, partial inflation, third-party support.