Editor's drafts for fix/chriscummings/ci-issues branch of timchown/address-accountability