Merge change Ib2c6429d into eclair

* changes:
  border for the non-badge case