Likely fix for channel mem leaks.
merge 8.6.3 core (ref: [core-8-6-3]; nb: specific tag could change in future.)