[#1606] Reduce overhead during writes because of ChannelPromise validation
Merge remote-tracking branch upstream/$:{upbranch}