Merge change Icb449407 into eclair

* changes:
  Fix push failure edge case (#2161999)