Editor's drafts for revert-30-main branch of netmod-wg/immutable-flag