Editor's drafts for feat/es-level-carriage branch of mondain/msfts