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