Editor's drafts for feat/si-rewrite branch of mondain/msfts