Editor's drafts for revert-141-snk-138 branch of moq-wg/msf