We should implement the BOLT changes from https://github.com/lightning/bolts/pull/1032 https://github.com/lightning/bolts/pull/1031 and https://github.com/lightning/bolts/pull/1040
We should implement the BOLT changes from lightning/bolts#1032lightning/bolts#1031 and lightning/bolts#1040