Editor's drafts for fix-dataset-selector branch of lisad/draft-happel-mailmaint-pdparchive