diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 14a0d5ea90..ac7854f265 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -33,23 +33,16 @@
                 "oderwat.indent-rainbow",
                 "redhat.vscode-yaml",
                 "spmeesseman.vscode-taskexplorer",
-                "visualstudioexptteam.vscodeintellicode"
+                "visualstudioexptteam.vscodeintellicode",
+                "ms-python.pylint"
             ],
             "settings": {
                 "terminal.integrated.defaultProfile.linux": "zsh",
                 "python.pythonPath": "/usr/local/bin/python",
                 "python.languageServer": "Default",
-                "python.linting.enabled": true,
-                "python.linting.pylintEnabled": true,
                 "python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
                 "python.formatting.blackPath": "/usr/local/py-utils/bin/black",
                 "python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
-                "python.linting.banditPath": "/usr/local/py-utils/bin/bandit",
-                "python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
-                "python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
-                "python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle",
-                "python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle",
-                "python.linting.pylintPath": "/usr/local/py-utils/bin/pylint",
                 "python.testing.pytestArgs": [
                     "ietf"
                 ],
diff --git a/dev/deploy-to-container/cli.js b/dev/deploy-to-container/cli.js
index 1c3d466286..a22c746ae2 100644
--- a/dev/deploy-to-container/cli.js
+++ b/dev/deploy-to-container/cli.js
@@ -245,7 +245,7 @@ async function main () {
     name: `dt-app-${branch}`,
     Hostname: `dt-app-${branch}`,
     Env: [
-      `LETSENCRYPT_HOST=${hostname}`,
+      // `LETSENCRYPT_HOST=${hostname}`,
       `VIRTUAL_HOST=${hostname}`,
       `VIRTUAL_PORT=8000`,
       `PGHOST=dt-db-${branch}`
diff --git a/ietf/api/views.py b/ietf/api/views.py
index e587b37121..73b873f5f3 100644
--- a/ietf/api/views.py
+++ b/ietf/api/views.py
@@ -210,11 +210,14 @@ def err(code, text):
                 except (NomCom.DoesNotExist, NomCom.MultipleObjectsReturned):
                     nomcom = None
                 if nomcom:
-                    Volunteer.objects.create(
+                    Volunteer.objects.get_or_create(
                         nomcom=nomcom,
                         person=object.person,
-                        affiliation=data['affiliation'],
-                        origin='registration')
+                        defaults={
+                            "affiliation": data["affiliation"],
+                            "origin": "registration"
+                        }
+                    )
             return HttpResponse(response, status=202, content_type='text/plain')
     else:
         return HttpResponse(status=405)
diff --git a/ietf/doc/models.py b/ietf/doc/models.py
index fdda23ecd1..434096929a 100644
--- a/ietf/doc/models.py
+++ b/ietf/doc/models.py
@@ -649,10 +649,10 @@ def referenced_by(self):
                 source__states__slug="active",
             )
             | models.Q(source__type__slug="rfc")
-        )
-    
+        ).distinct()
     
     def referenced_by_rfcs(self):
+        """Get refs to this doc from RFCs"""
         return self.relations_that(("refnorm", "refinfo", "refunk", "refold")).filter(
             source__type__slug="rfc"
         )
@@ -675,6 +675,13 @@ def contains(self):
     def part_of(self):
         return self.related_that("contains")
 
+    def referenced_by_rfcs_as_rfc_or_draft(self):
+        """Get refs to this doc, or a draft/rfc it came from, from an RFC"""
+        refs_to = self.referenced_by_rfcs()
+        if self.type_id == "rfc" and self.came_from_draft():
+            refs_to |= self.came_from_draft().referenced_by_rfcs()
+        return refs_to
+
     class Meta:
         abstract = True
 
diff --git a/ietf/doc/tests.py b/ietf/doc/tests.py
index f14b5b1af0..71ec23906c 100644
--- a/ietf/doc/tests.py
+++ b/ietf/doc/tests.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2012-2020, All Rights Reserved
+# Copyright The IETF Trust 2012-2023, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -40,7 +40,7 @@
     ConflictReviewFactory, WgDraftFactory, IndividualDraftFactory, WgRfcFactory, 
     IndividualRfcFactory, StateDocEventFactory, BallotPositionDocEventFactory, 
     BallotDocEventFactory, DocumentAuthorFactory, NewRevisionDocEventFactory,
-    StatusChangeFactory, DocExtResourceFactory, RgDraftFactory)
+    StatusChangeFactory, DocExtResourceFactory, RgDraftFactory, BcpFactory)
 from ietf.doc.forms import NotifyForm
 from ietf.doc.fields import SearchableDocumentsField
 from ietf.doc.utils import create_ballot_if_not_open, uppercase_std_abbreviated_name
@@ -156,6 +156,23 @@ def test_search(self):
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, draft.title)
 
+    def test_search_became_rfc(self):
+        draft = WgDraftFactory()
+        rfc = WgRfcFactory()
+        draft.set_state(State.objects.get(type="draft", slug="rfc"))
+        draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc)
+        base_url = urlreverse('ietf.doc.views_search.search')
+
+        # find by RFC
+        r = self.client.get(base_url + f"?rfcs=on&name={rfc.name}")
+        self.assertEqual(r.status_code, 200)
+        self.assertContains(r, rfc.title)
+
+        # find by draft
+        r = self.client.get(base_url + f"?activedrafts=on&rfcs=on&name={draft.name}")
+        self.assertEqual(r.status_code, 200)
+        self.assertContains(r, rfc.title)
+
     def test_search_for_name(self):
         draft = WgDraftFactory(name='draft-ietf-mars-test',group=GroupFactory(acronym='mars',parent=Group.objects.get(acronym='farfut')),authors=[PersonFactory()],ad=PersonFactory())
         draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="pub-req"))
@@ -1948,6 +1965,12 @@ def _parse_bibtex_response(self, response) -> dict:
 
     @override_settings(RFC_EDITOR_INFO_BASE_URL='https://www.rfc-editor.ietf.org/info/')
     def test_document_bibtex(self):
+
+        for factory in [CharterFactory, BcpFactory, StatusChangeFactory, ConflictReviewFactory]: # Should be extended to all other doc types
+            doc = factory()
+            url = urlreverse("ietf.doc.views_doc.document_bibtex", kwargs=dict(name=doc.name))
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 404)          
         rfc = WgRfcFactory.create(
             time=datetime.datetime(2010, 10, 10, tzinfo=ZoneInfo(settings.TIME_ZONE))
         )
@@ -2951,4 +2974,51 @@ def test_revisions(self):
         self.assertEqual(draft.revisions_by_dochistory(),[f"{i:02d}" for i in range(8,10)])
         self.assertEqual(draft.revisions_by_newrevisionevent(),[f"{i:02d}" for i in [*range(0,5), *range(6,10)]])      
 
+    def test_referenced_by_rfcs(self):
+        # n.b., no significance to the ref* values in this test
+        referring_draft = WgDraftFactory()
+        (rfc, referring_rfc) = WgRfcFactory.create_batch(2)
+        rfc.targets_related.create(relationship_id="refnorm", source=referring_draft)
+        rfc.targets_related.create(relationship_id="refnorm", source=referring_rfc)
+        self.assertCountEqual(
+            rfc.referenced_by_rfcs(),
+            rfc.targets_related.filter(source=referring_rfc),
+        )
+
+    def test_referenced_by_rfcs_as_rfc_or_draft(self):
+        # n.b., no significance to the ref* values in this test
+        draft = WgDraftFactory()
+        rfc = WgRfcFactory()
+        draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc)
+        
+        # Draft referring to the rfc and the draft - should not be reported at all
+        draft_referring_to_both = WgDraftFactory()
+        draft_referring_to_both.relateddocument_set.create(relationship_id="refnorm", target=draft)
+        draft_referring_to_both.relateddocument_set.create(relationship_id="refnorm", target=rfc)
+        
+        # RFC referring only to the draft - should be reported for either the draft or the rfc
+        rfc_referring_to_draft = WgRfcFactory()
+        rfc_referring_to_draft.relateddocument_set.create(relationship_id="refinfo", target=draft)
+
+        # RFC referring only to the rfc - should be reported only for the rfc
+        rfc_referring_to_rfc = WgRfcFactory()
+        rfc_referring_to_rfc.relateddocument_set.create(relationship_id="refinfo", target=rfc)
+
+        # RFC referring only to the rfc - should be reported only for the rfc
+        rfc_referring_to_rfc = WgRfcFactory()
+        rfc_referring_to_rfc.relateddocument_set.create(relationship_id="refinfo", target=rfc)
+
+        # RFC referring to the rfc and the draft - should be reported for both
+        rfc_referring_to_both = WgRfcFactory()
+        rfc_referring_to_both.relateddocument_set.create(relationship_id="refnorm", target=draft)
+        rfc_referring_to_both.relateddocument_set.create(relationship_id="refnorm", target=rfc)
+
+        self.assertCountEqual(
+            draft.referenced_by_rfcs_as_rfc_or_draft(),
+            draft.targets_related.filter(source__type="rfc"),
+        )
 
+        self.assertCountEqual(
+            rfc.referenced_by_rfcs_as_rfc_or_draft(),
+            draft.targets_related.filter(source__type="rfc") | rfc.targets_related.filter(source__type="rfc"),
+        )
diff --git a/ietf/doc/views_doc.py b/ietf/doc/views_doc.py
index 8408f5a0cd..e0bf328e89 100644
--- a/ietf/doc/views_doc.py
+++ b/ietf/doc/views_doc.py
@@ -1262,6 +1262,9 @@ def document_bibtex(request, name, rev=None):
 
     doc = get_object_or_404(Document, name=name)
 
+    if doc.type_id not in ["rfc", "draft"]:
+        raise Http404()
+
     doi = None
     draft_became_rfc = None
     replaced_by = None
@@ -1437,8 +1440,26 @@ def document_references(request, name):
     return render(request, "doc/document_references.html",dict(doc=doc,refs=sorted(refs,key=lambda x:x.target.name),))
 
 def document_referenced_by(request, name):
+    """View documents that reference the named document
+    
+    The view lists both direct references to a the named document, plus references to
+    related other documents. For a draft that became an RFC, this will include references
+    to the RFC. For an RFC, this will include references to the draft it came from, if any.
+    For a subseries document, this will include references to any of the RFC documents it
+    contains. 
+    
+    In the rendered output, a badge is applied to indicate the name of the document the
+    reference actually targeted. E.g., on the display for a draft that became RFC NNN,
+    references included because they point to that RFC would be shown with a tag "As RFC NNN".
+    The intention is to make the "Referenced By" page useful for finding related work while
+    accurately reflecting the actual reference relationships.     
+    """
     doc = get_object_or_404(Document,name=name)
     refs = doc.referenced_by()
+    if doc.came_from_draft():
+        refs |= doc.came_from_draft().referenced_by()
+    if doc.became_rfc():
+        refs |= doc.became_rfc().referenced_by()
     if doc.type_id in ["bcp","std","fyi"]:
         for rfc in doc.contains():
             refs |= rfc.referenced_by()
@@ -2167,13 +2188,31 @@ def idnits2_state(request, name, rev=None):
     if doc.type_id == "rfc":
         draft = doc.came_from_draft()
         if draft:
-            zero_revision = NewRevisionDocEvent.objects.filter(doc=draft,rev='00').first()
+            zero_revision = NewRevisionDocEvent.objects.filter(
+                doc=draft, rev="00"
+            ).first()
     else:
-        zero_revision = NewRevisionDocEvent.objects.filter(doc=doc,rev='00').first()
+        zero_revision = NewRevisionDocEvent.objects.filter(doc=doc, rev="00").first()
     if zero_revision:
         doc.created = zero_revision.time
     else:
-        doc.created = doc.docevent_set.order_by('-time').first().time
+        if doc.type_id == "draft":
+            if doc.became_rfc():
+                interesting_event = (
+                    doc.became_rfc()
+                    .docevent_set.filter(type="published_rfc")
+                    .order_by("-time")
+                    .first()
+                )
+            else:
+                interesting_event = doc.docevent_set.order_by(
+                    "-time"
+                ).first()  # Is taking the most _recent_ instead of the oldest event correct?
+        else:  # doc.type_id == "rfc"
+            interesting_event = (
+                doc.docevent_set.filter(type="published_rfc").order_by("-time").first()
+            )
+        doc.created = interesting_event.time
     if doc.std_level:
         doc.deststatus = doc.std_level.name
     elif doc.intended_std_level:
@@ -2181,8 +2220,16 @@ def idnits2_state(request, name, rev=None):
     else:
         text = doc.text()
         if text:
-            parsed_draft = PlaintextDraft(text=doc.text(), source=name, name_from_source=False)
+            parsed_draft = PlaintextDraft(
+                text=doc.text(), source=name, name_from_source=False
+            )
             doc.deststatus = parsed_draft.get_status()
         else:
-            doc.deststatus="Unknown"
-    return render(request, 'doc/idnits2-state.txt', context={'doc':doc}, content_type='text/plain;charset=utf-8')    
+            doc.deststatus = "Unknown"
+    return render(
+        request,
+        "doc/idnits2-state.txt",
+        context={"doc": doc},
+        content_type="text/plain;charset=utf-8",
+    )
+
diff --git a/ietf/doc/views_search.py b/ietf/doc/views_search.py
index 2e4231c5ac..789f32e387 100644
--- a/ietf/doc/views_search.py
+++ b/ietf/doc/views_search.py
@@ -211,6 +211,9 @@ def retrieve_search_results(form, all_types=False):
                     Q(targets_related__source__title__icontains=singlespace, targets_related__relationship_id="contains"),
                 ])
 
+        if query["rfcs"]:
+            queries.extend([Q(targets_related__source__name__icontains=look_for, targets_related__relationship_id="became_rfc")])
+
         combined_query = reduce(operator.or_, queries)
         docs = docs.filter(combined_query).distinct()
 
diff --git a/ietf/group/views.py b/ietf/group/views.py
index 991a1b8d87..698963678a 100644
--- a/ietf/group/views.py
+++ b/ietf/group/views.py
@@ -1296,7 +1296,7 @@ def stream_documents(request, acronym):
     qs = Document.objects.filter(stream=acronym).filter(
         Q(type_id="draft", states__type="draft", states__slug="active")
         | Q(type_id="rfc")
-    )
+    ).distinct()
     docs, meta = prepare_document_table(request, qs, max_results=1000)
     return render(request, 'group/stream_documents.html', {'stream':stream, 'docs':docs, 'meta':meta, 'editable':editable } )
 
diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py
index 47e2334f47..a57fcf63c1 100644
--- a/ietf/meeting/tests_views.py
+++ b/ietf/meeting/tests_views.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2009-2020, All Rights Reserved
+# Copyright The IETF Trust 2009-2023, All Rights Reserved
 # -*- coding: utf-8 -*-
 import datetime
 import io
@@ -6106,21 +6106,21 @@ def test_upload_minutes_agenda(self):
     
             test_file = BytesIO(b'this is some text for a test')
             test_file.name = "not_really.json"
-            r = self.client.post(url,dict(file=test_file))
+            r = self.client.post(url,dict(submission_method="upload",file=test_file))
             self.assertEqual(r.status_code, 200)
             q = PyQuery(r.content)
             self.assertTrue(q('form .is-invalid'))
     
             test_file = BytesIO(b'this is some text for a test'*1510000)
             test_file.name = "not_really.pdf"
-            r = self.client.post(url,dict(file=test_file))
+            r = self.client.post(url,dict(submission_method="upload",file=test_file))
             self.assertEqual(r.status_code, 200)
             q = PyQuery(r.content)
             self.assertTrue(q('form .is-invalid'))
     
             test_file = BytesIO(b'<html><frameset><frame src="foo.html"></frame><frame src="bar.html"></frame></frameset></html>')
             test_file.name = "not_really.html"
-            r = self.client.post(url,dict(file=test_file))
+            r = self.client.post(url,dict(submission_method="upload",file=test_file))
             self.assertEqual(r.status_code, 200)
             q = PyQuery(r.content)
             self.assertTrue(q('form .is-invalid'))
@@ -6128,7 +6128,7 @@ def test_upload_minutes_agenda(self):
             # Test html sanitization
             test_file = BytesIO(b'<html><head><title>Title</title></head><body><h1>Title</h1><section>Some text</section></body></html>')
             test_file.name = "some.html"
-            r = self.client.post(url,dict(file=test_file))
+            r = self.client.post(url,dict(submission_method="upload",file=test_file))
             self.assertEqual(r.status_code, 302)
             doc = session.sessionpresentation_set.filter(document__type_id=doctype).first().document
             self.assertEqual(doc.rev,'00')
@@ -6140,7 +6140,7 @@ def test_upload_minutes_agenda(self):
             # txt upload
             test_file = BytesIO(b'This is some text for a test, with the word\nvirtual at the beginning of a line.')
             test_file.name = "some.txt"
-            r = self.client.post(url,dict(file=test_file,apply_to_all=False))
+            r = self.client.post(url,dict(submission_method="upload",file=test_file,apply_to_all=False))
             self.assertEqual(r.status_code, 302)
             doc = session.sessionpresentation_set.filter(document__type_id=doctype).first().document
             self.assertEqual(doc.rev,'01')
@@ -6152,7 +6152,7 @@ def test_upload_minutes_agenda(self):
             self.assertIn('Revise', str(q("Title")))
             test_file = BytesIO(b'this is some different text for a test')
             test_file.name = "also_some.txt"
-            r = self.client.post(url,dict(file=test_file,apply_to_all=True))
+            r = self.client.post(url,dict(submission_method="upload",file=test_file,apply_to_all=True))
             self.assertEqual(r.status_code, 302)
             doc = Document.objects.get(pk=doc.pk)
             self.assertEqual(doc.rev,'02')
@@ -6161,7 +6161,7 @@ def test_upload_minutes_agenda(self):
             # Test bad encoding
             test_file = BytesIO('<html><h1>Title</h1><section>Some\x93text</section></html>'.encode('latin1'))
             test_file.name = "some.html"
-            r = self.client.post(url,dict(file=test_file))
+            r = self.client.post(url,dict(submission_method="upload",file=test_file))
             self.assertContains(r, 'Could not identify the file encoding')
             doc = Document.objects.get(pk=doc.pk)
             self.assertEqual(doc.rev,'02')
@@ -6191,7 +6191,7 @@ def test_upload_minutes_agenda_unscheduled(self):
 
             test_file = BytesIO(b'this is some text for a test')
             test_file.name = "not_really.txt"
-            r = self.client.post(url,dict(file=test_file,apply_to_all=False))
+            r = self.client.post(url,dict(submission_method="upload",file=test_file,apply_to_all=False))
             self.assertEqual(r.status_code, 410)
 
     @override_settings(MEETING_MATERIALS_SERVE_LOCALLY=True)
@@ -6211,7 +6211,7 @@ def test_upload_minutes_agenda_interim(self):
             self.assertFalse(session.sessionpresentation_set.filter(document__type_id=doctype))
             test_file = BytesIO(b'this is some text for a test')
             test_file.name = "not_really.txt"
-            r = self.client.post(url,dict(file=test_file))
+            r = self.client.post(url,dict(submission_method="upload",file=test_file))
             self.assertEqual(r.status_code, 302)
             doc = session.sessionpresentation_set.filter(document__type_id=doctype).first().document
             self.assertEqual(doc.rev,'00')
@@ -6223,6 +6223,46 @@ def test_upload_minutes_agenda_interim(self):
             self.requests_mock.get(f'{session.notes_url()}/info', text=json.dumps({'title': 'title', 'updatetime': '2021-12-01T17:11:00z'}))
             self.crawl_materials(url=url, top=top)
 
+    def test_enter_agenda(self):
+        session = SessionFactory(meeting__type_id='ietf')
+        url = urlreverse('ietf.meeting.views.upload_session_agenda',kwargs={'num':session.meeting.number,'session_id':session.id})
+        redirect_url = urlreverse('ietf.meeting.views.session_details', kwargs={'num':session.meeting.number,'acronym':session.group.acronym})
+        login_testing_unauthorized(self,"secretary",url)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertIn('Upload', str(q("Title")))
+        self.assertFalse(session.sessionpresentation_set.exists())
+
+        test_text = 'Enter agenda from scratch'
+        r = self.client.post(url,dict(submission_method="enter",content=test_text))
+        self.assertRedirects(r, redirect_url)
+        doc = session.sessionpresentation_set.filter(document__type_id='agenda').first().document
+        self.assertEqual(doc.rev,'00')
+
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertIn('Revise', str(q("Title")))
+
+        test_file = BytesIO(b'Upload after enter')
+        test_file.name = "some.txt"
+        r = self.client.post(url,dict(submission_method="upload",file=test_file))
+        self.assertRedirects(r, redirect_url)
+        doc = Document.objects.get(pk=doc.pk)
+        self.assertEqual(doc.rev,'01')
+
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertIn('Revise', str(q("Title")))
+
+        test_text = 'Enter after upload'
+        r = self.client.post(url,dict(submission_method="enter",content=test_text))
+        self.assertRedirects(r, redirect_url)
+        doc = Document.objects.get(pk=doc.pk)
+        self.assertEqual(doc.rev,'02')
+
     def test_upload_slides(self):
 
         session1 = SessionFactory(meeting__type_id='ietf')
diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py
index ab39266396..9d07df103e 100644
--- a/ietf/meeting/views.py
+++ b/ietf/meeting/views.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2007-2022, All Rights Reserved
+# Copyright The IETF Trust 2007-2023, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -2662,6 +2662,40 @@ def upload_session_minutes(request, session_id, num):
                   })
 
 
+class UploadOrEnterAgendaForm(UploadAgendaForm):
+    ACTIONS = [
+        ("upload", "Upload agenda"),
+        ("enter", "Enter agenda"),
+    ]
+    submission_method = forms.ChoiceField(choices=ACTIONS, widget=forms.RadioSelect)
+
+    content = forms.CharField(widget=forms.Textarea, required=False, strip=False, label="Agenda text")
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields["file"].required=False
+        self.order_fields(["submission_method", "file", "content"])
+
+    def clean_content(self):
+        return self.cleaned_data["content"].replace("\r", "")
+
+    def clean_file(self):
+        submission_method = self.cleaned_data.get("submission_method")
+        if submission_method == "upload":
+            return super().clean_file()
+        return None
+
+    def clean(self):
+        def require_field(f):
+            if not self.cleaned_data.get(f):
+                self.add_error(f, ValidationError("You must fill in this field."))
+
+        submission_method = self.cleaned_data.get("submission_method")
+        if submission_method == "upload":
+            require_field("file")
+        elif submission_method == "enter":
+            require_field("content")
+
 def upload_session_agenda(request, session_id, num):
     # num is redundant, but we're dragging it along an artifact of where we are in the current URL structure
     session = get_object_or_404(Session,pk=session_id)
@@ -2680,10 +2714,23 @@ def upload_session_agenda(request, session_id, num):
     agenda_sp = session.sessionpresentation_set.filter(document__type='agenda').first()
     
     if request.method == 'POST':
-        form = UploadAgendaForm(show_apply_to_all_checkbox,request.POST,request.FILES)
+        form = UploadOrEnterAgendaForm(show_apply_to_all_checkbox,request.POST,request.FILES)
         if form.is_valid():
-            file = request.FILES['file']
-            _, ext = os.path.splitext(file.name)
+            submission_method = form.cleaned_data['submission_method']
+            if submission_method == "upload":
+                file = request.FILES['file']
+                _, ext = os.path.splitext(file.name)
+            else:
+                if agenda_sp:
+                    doc = agenda_sp.document
+                    _, ext = os.path.splitext(doc.uploaded_filename)
+                else:
+                    ext = ".md"
+                fd, name = tempfile.mkstemp(suffix=ext, text=True)
+                os.close(fd)
+                with open(name, "w") as file:
+                    file.write(form.cleaned_data['content'])
+                file = open(name, "rb")
             apply_to_all = session.type.slug == 'regular'
             if show_apply_to_all_checkbox:
                 apply_to_all = form.cleaned_data['apply_to_all']
@@ -2738,7 +2785,11 @@ def upload_session_agenda(request, session_id, num):
             doc.uploaded_filename = filename
             e = NewRevisionDocEvent.objects.create(doc=doc,by=request.user.person,type='new_revision',desc='New revision available: %s'%doc.rev,rev=doc.rev)
             # The way this function builds the filename it will never trigger the file delete in handle_file_upload.
-            save_error = handle_upload_file(file, filename, session.meeting, 'agenda', request=request, encoding=form.file_encoding[file.name])
+            try:
+                encoding=form.file_encoding[file.name]
+            except AttributeError:
+                encoding=None
+            save_error = handle_upload_file(file, filename, session.meeting, 'agenda', request=request, encoding=encoding)
             if save_error:
                 form.add_error(None, save_error)
             else:
@@ -2746,7 +2797,11 @@ def upload_session_agenda(request, session_id, num):
                 messages.success(request, f'Successfully uploaded agenda as revision {doc.rev}.')
                 return redirect('ietf.meeting.views.session_details',num=num,acronym=session.group.acronym)
     else: 
-        form = UploadAgendaForm(show_apply_to_all_checkbox, initial={'apply_to_all':session.type_id=='regular'})
+        initial={'apply_to_all':session.type_id=='regular', 'submission_method':'upload'}
+        if agenda_sp:
+            doc = agenda_sp.document
+            initial['content'] = doc.text()
+        form = UploadOrEnterAgendaForm(show_apply_to_all_checkbox, initial=initial)
 
     return render(request, "meeting/upload_session_agenda.html", 
                   {'session': session,
diff --git a/ietf/nomcom/views.py b/ietf/nomcom/views.py
index ce7ca9a82d..7705be5697 100644
--- a/ietf/nomcom/views.py
+++ b/ietf/nomcom/views.py
@@ -1373,7 +1373,7 @@ def volunteer(request):
         form = VolunteerForm(person=person, data=request.POST)
         if form.is_valid():
             for nc in form.cleaned_data['nomcoms']:
-                nc.volunteer_set.create(person=person, affiliation=form.cleaned_data['affiliation'])
+                nc.volunteer_set.get_or_create(person=person, defaults={"affiliation": form.cleaned_data["affiliation"], "origin":"datatracker"})
             return redirect('ietf.ietfauth.views.profile')
     else:
         form = VolunteerForm(person=person,initial=dict(nomcoms=can_volunteer, affiliation=suggest_affiliation(person)))
diff --git a/ietf/static/js/upload-session-agenda.js b/ietf/static/js/upload-session-agenda.js
new file mode 100644
index 0000000000..b63d460ed8
--- /dev/null
+++ b/ietf/static/js/upload-session-agenda.js
@@ -0,0 +1,28 @@
+$(document)
+    .ready(function () {
+        var form = $("form.my-3");
+
+        // review submission selection
+        form.find("[name=submission_method]")
+            .on("click change", function () {
+                var val = form.find("[name=submission_method]:checked")
+                    .val();
+
+                var shouldBeVisible = {
+                    upload: ['[name="file"]'],
+                    enter: ['[name="content"]']
+                };
+
+                for (var v in shouldBeVisible) {
+                    for (var i in shouldBeVisible[v]) {
+                        var selector = shouldBeVisible[v][i];
+                        var row = form.find(selector).parent();
+                        if ($.inArray(selector, shouldBeVisible[val]) != -1)
+                            row.show();
+                        else
+                            row.hide();
+                    }
+                }
+            })
+            .trigger("change");
+    });
\ No newline at end of file
diff --git a/ietf/templates/doc/document_referenced_by.html b/ietf/templates/doc/document_referenced_by.html
index 2c1729f99c..e1137768b7 100644
--- a/ietf/templates/doc/document_referenced_by.html
+++ b/ietf/templates/doc/document_referenced_by.html
@@ -38,10 +38,10 @@ <h1>References to {{ name|prettystdname }}</h1>
         </thead>
         <tbody>
             {% for ref in refs %}
-                {% with ref.source.name as name %}
+                {% with ref.source.name as src_name %}
                     <tr>
                         <td>
-                            <a href="{% url 'ietf.doc.views_doc.document_main' name=name %}">{{ name|prettystdname }}</a>
+                            <a href="{% url 'ietf.doc.views_doc.document_main' name=src_name %}">{{ src_name|prettystdname }}</a>
                             {% if ref.target.name != name %}
                                 <br>
                                 <span class="badge rounded-pill text-bg-info">As {{ ref.target.name }}</span>
@@ -51,13 +51,13 @@ <h1>References to {{ name|prettystdname }}</h1>
                             <b>{{ ref.source.title }}</b>
                             <br>
                             <a class="btn btn-primary btn-sm"
-                               href="{% url 'ietf.doc.views_doc.document_references' name %}"
+                               href="{% url 'ietf.doc.views_doc.document_references' src_name %}"
                                rel="nofollow">
                                 <i class="bi bi-arrow-left"></i>
                                 References
                             </a>
                             <a class="btn btn-primary btn-sm"
-                               href="{% url 'ietf.doc.views_doc.document_referenced_by' name %}"
+                               href="{% url 'ietf.doc.views_doc.document_referenced_by' src_name %}"
                                rel="nofollow">
                                 <i class="bi bi-arrow-right"></i>
                                 Referenced by
diff --git a/ietf/templates/meeting/upload_session_agenda.html b/ietf/templates/meeting/upload_session_agenda.html
index 1856a75bdb..57cba6b53c 100644
--- a/ietf/templates/meeting/upload_session_agenda.html
+++ b/ietf/templates/meeting/upload_session_agenda.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2023, All Rights Reserved #}
 {% load origin static django_bootstrap5 tz %}
 {% block title %}
     {% if agenda_sp %}
@@ -29,6 +29,9 @@ <h2>Session {{ session_number }} : {{ session.official_timeslotassignment.timesl
     <form enctype="multipart/form-data" method="post" class="my-3">
         {% csrf_token %}
         {% bootstrap_form form %}
-        <button type="submit" class="btn btn-primary">Upload</button>
+        <button type="submit" class="btn btn-primary">Save</button>
     </form>
+{% endblock %}
+{% block js %}
+    <script src="{% static 'ietf/js/upload-session-agenda.js' %}"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/person/profile.html b/ietf/templates/person/profile.html
index cc504ebc8d..42e5d2e43a 100644
--- a/ietf/templates/person/profile.html
+++ b/ietf/templates/person/profile.html
@@ -109,7 +109,7 @@ <h2 class="mt-5" id="rfcs-{{ forloop.counter }}">
                             <td>{{ doc.pub_date|date:"b Y"|title }}</td>
                             <td>{{ doc.title|urlize_ietf_docs }}</td>
                             <td class="text-end">
-                                {% with doc.referenced_by_rfcs.count as refbycount %}
+                                {% with doc.referenced_by_rfcs_as_rfc_or_draft.count as refbycount %}
                                     {% if refbycount %}
                                         <a class="text-end"
                                            href="{% url 'ietf.doc.views_doc.document_referenced_by' doc.name %}"
diff --git a/package.json b/package.json
index b6df202e7d..a87d5ac131 100644
--- a/package.json
+++ b/package.json
@@ -152,6 +152,7 @@
         "ietf/static/js/timezone.js",
         "ietf/static/js/upcoming.js",
         "ietf/static/js/upload-material.js",
+        "ietf/static/js/upload-session-agenda.js",
         "ietf/static/js/upload_bofreq.js",
         "ietf/static/js/upload_statement.js",
         "ietf/static/js/zxcvbn.js"