Editor's drafts for partial-fix-4 branch of MikeBishop/quic-samsara