v0.36.1-rc1

[alexanderbez]

A collection of non-breaking cherry picks from master since the latest v0.36.0 release.

---

• Targeted PR against correct branch (see CONTRIBUTING.md)

• Linked to github-issue with discussion and accepted design OR link to spec that describes this work.

• Wrote tests

• Updated relevant documentation (docs/)

• Added a relevant changelog entry to the Unreleased section in CHANGELOG.md

• Re-reviewed Files changed in the github PR explorer

---

For Admin Use:

• Added appropriate labels to PR (ex. wip, ready-for-review, docs)
• Reviewers Assigned
• Squashed all commits, uses message "Merge pull request #XYZ: [title]" (coding standards)

[codecov]

Codecov Report

Merging #4907 into rc1/v0.36.1 will decrease coverage by 0.01%.
The diff coverage is 33.33%.

@@               Coverage Diff               @@
##           rc1/v0.36.1    #4907      +/-   ##
===============================================
- Coverage        51.08%   51.06%   -0.02%     
===============================================
  Files              290      290              
  Lines            18796    18802       +6     
===============================================
  Hits              9601     9601              
- Misses            8503     8508       +5     
- Partials           692      693       +1