Merge change I26bb7b8b into eclair

* changes:
  Handle change from push to other intervals properly (#2165032)