Resolve conflicts with `master`

[Sneagan]

Summary

Type of Change

• [ ] Product feature
• [ ] Bug fix
• [ ] Performance improvement
• [ ] Refactor
• [ ] Other

Tested Environments

• [ ] Development
• [ ] Staging
• [ ] Production

Before Requesting Review

• [ ] Does your code build cleanly without any errors or warnings?
• [ ] Have you used auto closing keywords?
• [ ] Have you added tests for new functionality?
• [ ] Have validated query efficiency for new database queries?
• [ ] Have documented new functionality in README or in comments?
• [ ] Have you squashed all intermediate commits?
• [ ] Is there a clear title that explains what the PR does?
• [ ] Have you used intuitive function, variable and other naming?
• [ ] Have you requested security and/or privacy review if needed
• [ ] Have you performed a self review of this PR?

Manual Test Plan

[pavelbrm]

A few PRs for Ntiro have been closed recently. Should this one follow the same path? @Sneagan

[tackley]

Is this still relevant? Or can we close or mark as draft please to remove from our needs-review lists?

[pavelbrm]

@tackley I believe this is not relevant anymore, but will leave the decision to @Sneagan.