Merge change I847e8ab8 into eclair

* changes:
  Fix issue #2258571: Fix build versions