Commit graph

10816 commits

Author SHA1 Message Date
Robert Sparks cd748cd760 Update internal references to trac.tools.ietf.org to point to trac.ietf.org. Remove several links into tools.ietf.org. Commit ready for merge.
- Legacy-Id: 19422
2021-10-13 21:43:44 +00:00
Robert Sparks 21f5a55e2f Only show roles in active roups in the oidc roles claim. Fixes #3424. Commit ready for merge.
- Legacy-Id: 19412
2021-10-11 19:08:46 +00:00
Robert Sparks d1a9f0d844 Handle general IESG requirements display corrects. Fixes #3418. Commit ready for merge.
- Legacy-Id: 19411
2021-10-11 17:35:42 +00:00
Robert Sparks 3386e59a61 Set version info and settings back to development mode
- Legacy-Id: 19408
2021-10-08 16:26:33 +00:00
Robert Sparks dd60b4bfa6 Set version info to release version 7.39.0 before branching.
- Legacy-Id: 19406
2021-10-08 16:26:22 +00:00
Robert Sparks 0906ac217f Updated timezone names
- Legacy-Id: 19403
2021-10-08 16:13:50 +00:00
Robert Sparks 7f147de7e3 provided typing for DEV_PRE_APPS
- Legacy-Id: 19402
2021-10-08 16:04:02 +00:00
Mark J. Donnelly 604d6edef0 Add a new Django field, IETFJSONField
This field is needed because the plain JSONField does not permit empty arrays - [] - or empty objects - {} - when the field is marked as required.  Those values explicitly evaluate to a null value, and are rejected.

Instead, the IETFJSONField accepts two new arguments to control this:
- empty_values: An array of values that should evaluate to null/empty, and be rejected.
- accepted_empty_values: An array of values that should *not* evaluate to null/empty, and be accepted.

This allows the programmer to specify either a positive or negative statement of what values to accept.

Fixes issue #3331.  Commit ready for merge.
 - Legacy-Id: 19401
2021-10-07 19:30:51 +00:00
Robert Sparks a8aab5cb17 Added scout-apm to the requirements and added settings scaffolding.
- Legacy-Id: 19399
2021-10-07 16:39:29 +00:00
Robert Sparks 6a13fd7062 Merged in [19396] from rjsparks@nostrum.com:
Provide a metadata endpoint to assist rfcdiff.pyht.
 - Legacy-Id: 19397
Note: SVN reference [19396] has been migrated to Git commit 036966da97
2021-10-01 22:08:16 +00:00
Robert Sparks 036966da97 Provide a metadata endpoint to assist rfcdiff.pyht. Commit ready for merge.
- Legacy-Id: 19396
2021-10-01 21:31:24 +00:00
Robert Sparks d904c028b7 Merged in [19393] from krathnayake@ietf.org:
Fixes API authentication issue.
 - Legacy-Id: 19395
Note: SVN reference [19393] has been migrated to Git commit 90297bc2ab
2021-10-01 18:39:20 +00:00
Robert Sparks cb5c94868f Merged in [19392] from krathnayake@ietf.org:
Improves API authentication tests. Relates to #3412.
 - Legacy-Id: 19394
Note: SVN reference [19392] has been migrated to Git commit 6292e528fd
2021-10-01 18:23:54 +00:00
Kesara Rathnayake 90297bc2ab Fixes API authentication issue. Commit ready for merge.
- Legacy-Id: 19393
2021-10-01 04:43:54 +00:00
Kesara Rathnayake 6292e528fd Improves API authentication tests. Relates to #3412. Commit ready for merge.
- Legacy-Id: 19392
2021-09-24 10:01:03 +00:00
Robert Sparks 45caa771f4 Merged in [19385] from jennifer@painless-security.com:
Correctly highlight session constraints in the meeting schedule editor. Fixes #3327.
 - Legacy-Id: 19389
Note: SVN reference [19385] has been migrated to Git commit 67198180e1
2021-09-23 18:10:12 +00:00
Robert Sparks dd33e91237 Merged in [19384] from jennifer@painless-security.com:
Update links in iCal description to be more useful. Fixes #3349.
 - Legacy-Id: 19388
Note: SVN reference [19384] has been migrated to Git commit 7d59456103
2021-09-23 17:27:25 +00:00
Robert Sparks 5238d1c865 Merged in [19383] from jennifer@painless-security.com:
Allow pre-ADs to be assigned as responsible for document. Fixes #3229.
 - Legacy-Id: 19387
Note: SVN reference [19383] has been migrated to Git commit fc9864114b
2021-09-23 17:12:40 +00:00
Robert Sparks 704f2693e0 Merged in [19382] from krathnayake@ietf.org:
Adds ability to hanndle garbage API keys. Fixes #3412.
 - Legacy-Id: 19386
Note: SVN reference [19382] has been migrated to Git commit 02b8559512
2021-09-23 15:32:47 +00:00
Jennifer Richards 67198180e1 Correctly highlight session constraints in the meeting schedule editor. Fixes #3327. Commit ready for merge.
- Legacy-Id: 19385
2021-09-22 22:47:59 +00:00
Jennifer Richards 7d59456103 Update links in iCal description to be more useful. Fixes #3349. Commit ready for merge.
- Legacy-Id: 19384
2021-09-22 21:52:21 +00:00
Jennifer Richards fc9864114b Allow pre-ADs to be assigned as responsible for document. Fixes #3229. Commit ready for merge.
- Legacy-Id: 19383
2021-09-22 18:42:00 +00:00
Kesara Rathnayake 02b8559512 Adds ability to hanndle garbage API keys. Fixes #3412. Commit ready for merge.
- Legacy-Id: 19382
2021-09-22 06:40:49 +00:00
Robert Sparks 58fa3218eb Set version info and settings back to development mode
- Legacy-Id: 19378
2021-09-20 16:38:37 +00:00
Robert Sparks c0b992889c Set version info to release version 7.38.0 before branching.
- Legacy-Id: 19376
2021-09-20 16:38:27 +00:00
Robert Sparks afe5963826 Add missing migration
- Legacy-Id: 19373
2021-09-20 16:26:25 +00:00
Robert Sparks 9d09cedc91 Merged in [19363] from rjsparks@nostrum.com:
Tune text draft reference extractor. Fixes #3404.
 - Legacy-Id: 19371
Note: SVN reference [19363] has been migrated to Git commit 50a1e6e66b
2021-09-19 14:56:42 +00:00
Robert Sparks 0d8c0ce776 Merged in [19360] from rjsparks@nostrum.com:
Change url and instructive text in email sent when a ballot position is taken. Fixes #3208.
 - Legacy-Id: 19370
Note: SVN reference [19360] has been migrated to Git commit ea8b734874
2021-09-19 14:39:42 +00:00
Robert Sparks a51e5e87fa Merged in [19359] from rjsparks@nostrum.com:
Render markdown agendas in popups on the agenda page. Fixes #3039.
 - Legacy-Id: 19369
Note: SVN reference [19359] has been migrated to Git commit 7912d05417
2021-09-18 21:45:43 +00:00
Robert Sparks a789c2bdc3 Merged in [19358] from rjsparks@nostrum.com:
Remove remaining use of markdown2. Enable markdown extras when rendering agendas. Fixes #3316.
 - Legacy-Id: 19368
Note: SVN reference [19358] has been migrated to Git commit 6ac363e3e2
2021-09-18 21:26:41 +00:00
Robert Sparks 8cd1970e55 Merged in [19357] from rjsparks@nostrum.com:
Provide a page that shows how current charter text renders through markdown. Related to #2695.
 - Legacy-Id: 19367
Note: SVN reference [19357] has been migrated to Git commit d7841409ca
2021-09-18 18:54:40 +00:00
Robert Sparks 4e7ad4cdd3 Merged in [19355] from krathnayake@ietf.org:
Hides profile photo place holder. Fixes #3400.
 - Legacy-Id: 19366
Note: SVN reference [19355] has been migrated to Git commit 6fa0f37cbd
2021-09-18 18:35:34 +00:00
Robert Sparks acd13c97bf Merged in [19353] from jennifer@painless-security.com:
Use live_server_url as IDTRACKER_BASE_URL in IetfLiveServerTestCase. Fixes #3203.
 - Legacy-Id: 19365
Note: SVN reference [19353] has been migrated to Git commit c390fe012e
2021-09-18 18:16:27 +00:00
Robert Sparks 766a4638b2 Merged in [19344] from krathnayake@ietf.org:
Implements /api/appauth/authortools API endpoint. Fixes #3396.
 - Legacy-Id: 19364
Note: SVN reference [19344] has been migrated to Git commit dc833aa85c
2021-09-18 17:07:47 +00:00
Robert Sparks 50a1e6e66b Tune text draft reference extractor. Fixes #3404. Commit ready for merge.
- Legacy-Id: 19363
2021-09-14 16:44:30 +00:00
Robert Sparks ea8b734874 Change url and instructive text in email sent when a ballot position is taken. Fixes #3208. Commit ready for merge.
- Legacy-Id: 19360
2021-09-09 17:44:22 +00:00
Robert Sparks 7912d05417 Render markdown agendas in popups on the agenda page. Fixes #3039. Commit ready for merge.
- Legacy-Id: 19359
2021-09-08 19:16:48 +00:00
Robert Sparks 6ac363e3e2 Remove remaining use of markdown2. Enable markdown extras when rendering agendas. Fixes #3316. Commit ready for merge.
- Legacy-Id: 19358
2021-09-08 17:54:40 +00:00
Robert Sparks d7841409ca Provide a page that shows how current charter text renders through markdown. Related to #2695. Commit ready for merge.
- Legacy-Id: 19357
2021-09-08 16:47:47 +00:00
Kesara Rathnayake 6fa0f37cbd Hides profile photo place holder. Fixes #3400. Commit ready for merge.
- Legacy-Id: 19355
2021-09-08 04:53:43 +00:00
Jennifer Richards c390fe012e Use live_server_url as IDTRACKER_BASE_URL in IetfLiveServerTestCase. Fixes #3203. Commit ready for merge.
- Legacy-Id: 19353
2021-09-07 18:18:13 +00:00
Robert Sparks b531a5c3cc Set version info and settings back to development mode
- Legacy-Id: 19350
2021-09-06 15:57:53 +00:00
Robert Sparks 50e4af84d3 Set version info to release version 7.37.0 before branching.
- Legacy-Id: 19348
2021-09-06 15:57:44 +00:00
Robert Sparks 10e84fb7b0 Add migration capturing change to logo validation.
- Legacy-Id: 19345
2021-09-06 15:45:25 +00:00
Kesara Rathnayake dc833aa85c Implements /api/appauth/authortools API endpoint. Fixes #3396. Commit ready for merge.
- Legacy-Id: 19344
2021-09-06 11:42:16 +00:00
Robert Sparks 74b14b6de5 Merged in [19339] [19340] from jennifer@painless-security.com:
Refactor get_related_meeting to simplify / correctly handle recording doctype
 - Legacy-Id: 19343
Note: SVN reference [19339] has been migrated to Git commit 05870adeeb

Note: SVN reference [19340] has been migrated to Git commit c0b076258b
2021-09-05 14:57:32 +00:00
Jennifer Richards c0b076258b Add test for get_related_meeting. Branch ready for merge.
- Legacy-Id: 19340
2021-09-05 13:32:01 +00:00
Jennifer Richards 05870adeeb Refactor get_related_meeting to simplify / correctly handle recording doctype
- Legacy-Id: 19339
2021-09-05 13:02:33 +00:00
Robert Sparks d5b0bc6ccc Reordered migrations. Updated name fixture.
- Legacy-Id: 19336
2021-09-04 15:33:53 +00:00
Robert Sparks f3a433672a Merged in [19316] from rjsparks@nostrum.com:
Adjust groupfeatures has_session_materials to match modern usage. Adjusted proceedings and materials templates to show fewer unnecessary duplicates. Fixes #2981 and #3387.
 - Legacy-Id: 19335
Note: SVN reference [19316] has been migrated to Git commit d4899b78f9
2021-09-04 15:01:38 +00:00
Robert Sparks cecf079139 Merged in [19315] from rjsparks@nostrum.com:
Restore ADs ability to charter new groups. Fixes #3397. ,
 - Legacy-Id: 19334
Note: SVN reference [19315] has been migrated to Git commit 311b4728e1
2021-09-04 03:21:32 +00:00
Robert Sparks 333173271d Merged in [19313] from rjsparks@nostrum.com:
Show new group types on active groups page, but see #3393.
 - Legacy-Id: 19333
Note: SVN reference [19313] has been migrated to Git commit aeff343eee
2021-09-04 03:01:33 +00:00
Robert Sparks 1f428b545a Merged in [19312] from jennifer@painless-security.com:
Handle missing 'to' field in process_response_email. Relates to #3357.
 - Legacy-Id: 19332
Note: SVN reference [19312] has been migrated to Git commit 0782ee0843
2021-09-03 22:42:26 +00:00
Robert Sparks 0ebccd4583 Merged in [19311] from rjsparks@nostrum.com:
Adjust tests and forms to match changes to permissions made in through the admin. These need to use the data rather than the code. See #3393.
 - Legacy-Id: 19331
Note: SVN reference [19311] has been migrated to Git commit 4240ce088e
2021-09-03 22:08:07 +00:00
Robert Sparks c8552cbb55 Merged in [19310] from rjsparks@nostrum.com:
Add IETF Administrative LLC groups. Fixes #3302.
 - Legacy-Id: 19330
Note: SVN reference [19310] has been migrated to Git commit 847f37dbf7
2021-09-03 22:06:12 +00:00
Robert Sparks 6cdd1c58ae Merged in [19308] from jennifer@painless-security.com:
Include doc name in ballot popup anchors. Fixes #3351.
 - Legacy-Id: 19329
Note: SVN reference [19308] has been migrated to Git commit 54a524b124
2021-09-03 21:44:12 +00:00
Robert Sparks ff5707b5f0 Merged in [19307] from rjsparks@nostrum.com:
Add IAB Administrative Support Group group type. Add IAB groups to the group menu. Clearly delineate group types in the group menu. Fixes #3295 and #3296.
 - Legacy-Id: 19328
Note: SVN reference [19307] has been migrated to Git commit d42730300a
2021-09-03 21:29:12 +00:00
Robert Sparks 65f7f62725 Merged in [19306] from jennifer@painless-security.com:
Improve proceedings display with new title block, configurable host logos, and additional PDF or URL materials. Fixes #3147.
 - Legacy-Id: 19327
Note: SVN reference [19306] has been migrated to Git commit 2060173f3a
2021-09-03 21:12:32 +00:00
Robert Sparks b80366b492 Merged in [19305] from rjsparks@nostrum.com:
Show the constraint names on the meeting session requests page. Fixes #3082.
 - Legacy-Id: 19326
Note: SVN reference [19305] has been migrated to Git commit 6a7ebfdb7a
2021-09-03 18:36:32 +00:00
Robert Sparks 93fe2e5ac0 Merged in [19301] [19303] [19304] from rjsparks@nostrum.com:
Include new conflict types in the session request notification email. Fixes #3381.
 - Legacy-Id: 19324
Note: SVN reference [19301] has been migrated to Git commit 7db98010e2

Note: SVN reference [19303] has been migrated to Git commit 5f465caa18

Note: SVN reference [19304] has been migrated to Git commit 05390ebb7a
2021-09-03 18:06:47 +00:00
Robert Sparks a6205c3c31 Merged in [19300] from jennifer@painless-security.com:
Handle num=None case in proceedings() and specify meeting number in test_proceedings_no_agenda. Fixes #3385.
 - Legacy-Id: 19323
Note: SVN reference [19300] has been migrated to Git commit ca78da6ff4
2021-09-03 17:42:12 +00:00
Robert Sparks 36369f816e Merged in [19299] from rjsparks@nostrum.com:
Change the caching model for the nonwg list page.
 - Legacy-Id: 19322
Note: SVN reference [19299] has been migrated to Git commit fe5cfbd11d
2021-09-03 17:24:58 +00:00
Robert Sparks 2ffd9d88de Merged in [19298] from rjsparks@nostrum.com:
Remove outdated mechanic for adding additional email addresses to crash reports from several apps.
 - Legacy-Id: 19321
Note: SVN reference [19298] has been migrated to Git commit 24782163cb
2021-09-03 17:01:01 +00:00
Robert Sparks d4899b78f9 Adjust groupfeatures has_session_materials to match modern usage. Adjusted proceedings and materials templates to show fewer unnecessary duplicates. Fixes #2981 and #3387. Commit ready for merge.
- Legacy-Id: 19316
2021-09-03 15:14:06 +00:00
Robert Sparks 311b4728e1 Restore ADs ability to charter new groups. Fixes #3397. Commit ready for merge,
- Legacy-Id: 19315
2021-09-02 23:25:36 +00:00
Robert Sparks aeff343eee Show new group types on active groups page, but see #3393. Commit ready for merge.
- Legacy-Id: 19313
2021-09-01 15:54:25 +00:00
Jennifer Richards 0782ee0843 Handle missing 'to' field in process_response_email. Relates to #3357. Commit ready for merge.
- Legacy-Id: 19312
2021-09-01 14:53:35 +00:00
Robert Sparks 4240ce088e Adjust tests to match changes to permissions made in through the admin. These need to use the data rather than the code. See #3393. Commit ready for merge.
- Legacy-Id: 19311
2021-09-01 14:30:09 +00:00
Robert Sparks 847f37dbf7 Add IETF Administrative LLC groups. Fixes #3302. Commit ready for merge.
- Legacy-Id: 19310
2021-08-31 22:13:38 +00:00
Jennifer Richards 54a524b124 Include doc name in ballot popup anchors. Fixes #3351. Commit ready for merge.
- Legacy-Id: 19308
2021-08-31 17:24:32 +00:00
Robert Sparks d42730300a Add IAB Administrative Support Group group type. Add IAB groups to the group menu. Clearly delineate group types in the group menu. Fixes #3295 and #3296. Commit ready for merge.
- Legacy-Id: 19307
2021-08-30 19:39:21 +00:00
Jennifer Richards 2060173f3a Improve proceedings display with new title block, configurable host logos, and additional PDF or URL materials. Fixes #3147. Commit ready for merge.
- Legacy-Id: 19306
2021-08-30 17:02:49 +00:00
Robert Sparks 6a7ebfdb7a Show the constraint names on the meeting session requests page. Fixes #3082. Commit ready for merge.
- Legacy-Id: 19305
2021-08-27 19:45:19 +00:00
Robert Sparks 05390ebb7a r19301 on session request notificaiton email was faulty (buffers reverted between test and commit). This corrects it. Commit ready for merge.
- Legacy-Id: 19304
2021-08-26 22:42:37 +00:00
Robert Sparks 5f465caa18 Remove unintended debug statement. Commit ready for merge.
- Legacy-Id: 19303
2021-08-26 22:18:37 +00:00
Robert Sparks 771e854a18 Removed unused cache_page import from mailinglists.views. Commit ready for merge
- Legacy-Id: 19302
2021-08-26 22:03:21 +00:00
Robert Sparks 7db98010e2 Include new conflict types in the session request notification email. Fixes #3381. Commit ready for merge.
- Legacy-Id: 19301
2021-08-26 21:51:04 +00:00
Jennifer Richards ca78da6ff4 Handle num=None case in proceedings() and specify meeting number in test_proceedings_no_agenda. Fixes #3385. Commit ready for merge.
- Legacy-Id: 19300
2021-08-20 16:16:00 +00:00
Robert Sparks fe5cfbd11d Change the caching model for the nonwg list page. Commit ready for merge.
- Legacy-Id: 19299
2021-08-12 14:17:51 +00:00
Robert Sparks 24782163cb Remove outdated mechanic for adding additional email addresses to crash reports from several apps. Commit ready for merge.
- Legacy-Id: 19298
2021-08-11 15:35:28 +00:00
Jennifer Richards b88a695ad1 Allow generated schedules to inherit from a base schedule. Fixes #3170. Commit ready for merge.
- Legacy-Id: 19297
2021-08-10 14:22:06 +00:00
Jennifer Richards e31d360349 Update create_dummy_meeting to set start date / time zone. Related to #3166. Range 19295:19296 ready for merge.
- Legacy-Id: 19296
2021-08-09 20:46:13 +00:00
Jennifer Richards 2eacd88c0b Disable modification of past timeslots on official schedules. Fixes #3166.
- Legacy-Id: 19295
2021-08-09 20:43:20 +00:00
Robert Sparks 24ec2ffc42 Set version info and settings back to development mode
- Legacy-Id: 19291
2021-08-06 15:05:20 +00:00
Robert Sparks a9ad04c691 Set version info to release version 7.36.0 before branching.
- Legacy-Id: 19289
2021-08-06 15:05:11 +00:00
Robert Sparks 45abea06d9 Convert IETF111 Constraints
- Legacy-Id: 19285
2021-08-05 22:03:30 +00:00
Robert Sparks f0511fdeba Merged in [19277] from rjsparks@nostrum.com:
Restrict group creation to the secretariat.
 - Legacy-Id: 19284
Note: SVN reference [19277] has been migrated to Git commit 62a3a4fe41
2021-08-05 18:53:15 +00:00
Robert Sparks 6680096aa0 Merged in [19272] from rjsparks@nostrum.com:
Improve the BOF request upload form validation.
 - Legacy-Id: 19283
Note: SVN reference [19272] has been migrated to Git commit 2bcd6f8ef4
2021-08-05 18:41:22 +00:00
Robert Sparks 4023447f23 Merged in [19271] from rjsparks@nostrum.com:
Improve tests that look person names in responses.
 - Legacy-Id: 19282
Note: SVN reference [19271] has been migrated to Git commit f3b72e4bc1
2021-08-05 18:21:21 +00:00
Robert Sparks 54b6448445 Merged in [19270] from rjsparks@nostrum.com:
Bring the factory-boy and Faker dependencies forward through some minor breaking changes. Stop using the deprecated fr_QC locale in Faker.
 - Legacy-Id: 19281
Note: SVN reference [19270] has been migrated to Git commit b99eecc1ae
2021-08-05 18:07:40 +00:00
Robert Sparks a03dbf2df0 Merged in [19269] from rjsparks@nostrum.com:
Allow submit and expire_drafts to succeed when there is no 'next' IETF meeting in the database. Fixes #3370.
 - Legacy-Id: 19280
Note: SVN reference [19269] has been migrated to Git commit 47082fe4c5
2021-08-05 17:36:31 +00:00
Robert Sparks 9f5614114f Merged in [19267] from rjsparks@nostrum.com:
Improve the idnits2 state file.
 - Legacy-Id: 19279
Note: SVN reference [19267] has been migrated to Git commit c93be0bd1d
2021-08-05 17:23:36 +00:00
Robert Sparks 737eff67af Merged in [19266] from jennifer@painless-security.com:
Allow configuration of group conflict types used for each meeting Fixes #2770.
 - Legacy-Id: 19278
Note: SVN reference [19266] has been migrated to Git commit 336d762123
2021-08-05 17:09:43 +00:00
Robert Sparks 62a3a4fe41 Restrict group creation to the secretariat. Commit ready to merge.
- Legacy-Id: 19277
2021-08-05 14:56:28 +00:00
Robert Sparks 14a8e3c6db Merged in [19262] [19263] [19264] [19265] from rjsparks@nostrum.com:
Provide replacements for idnits2's internal use of tools.ietf.org:
        - representation of obsoleted RFCs    
        - rfc-status blob
        - minimal per-document .status files
 - Legacy-Id: 19276
Note: SVN reference [19262] has been migrated to Git commit 3283645252

Note: SVN reference [19263] has been migrated to Git commit b179143303

Note: SVN reference [19264] has been migrated to Git commit d283b9674a

Note: SVN reference [19265] has been migrated to Git commit 1eb46361a0
2021-08-04 22:43:12 +00:00
Robert Sparks e595415ce3 Merged in [19260] from jennifer@painless-security.com:
Remove Meetecho icon from agenda items and change 'Meetecho video stream' to 'Meetecho session' for remaining link. Fixes #3135, #3223.
 - Legacy-Id: 19275
Note: SVN reference [19260] has been migrated to Git commit ec86d98bb7
2021-08-04 22:09:51 +00:00
Robert Sparks 2bcd6f8ef4 Improve the BOF request upload form validation. Commit ready for merge.
- Legacy-Id: 19272
2021-08-04 16:20:28 +00:00
Robert Sparks f3b72e4bc1 Improve tests that look person names in responses. Commit ready for merge.
- Legacy-Id: 19271
2021-08-04 14:46:11 +00:00
Robert Sparks b99eecc1ae Bring the factory-boy and Faker dependencies forward through some minor breaking changes. Stop using the deprecated fr_QC locale in Faker. Commit ready for merge.
- Legacy-Id: 19270
2021-08-03 22:22:35 +00:00
Robert Sparks 47082fe4c5 Allow submit and expire_drafts to succeed when there is no "next" IETF meeting in the database. Fixes #3370. Commit ready for merge.
- Legacy-Id: 19269
2021-08-01 17:50:35 +00:00