Merge change I16dc1411 into eclair-mr2

* changes:
  add boundary patch