Merge pull request #1430 from vincenzopalazzo/macros/channel_reestablish_v2