Editor's drafts for feat/add-router-streaming branch of timchown/address-accountability