reconcile main tree with open-source eclair beagle-eclair master beagle-eclair-0x4 beagle-eclair-0x5