Merge #3674 into v0.32.1

[alexanderbez]

PR #3674 into release v0.32.1.

---

• 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 entries in PENDING.md with issue #

• rereviewed 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 #3686 into release/v0.32.1 will increase coverage by 0.57%.
The diff coverage is 89.18%.

@@                 Coverage Diff                 @@
##           release/v0.32.1    #3686      +/-   ##
===================================================
+ Coverage            60.62%   61.19%   +0.57%     
===================================================
  Files                  189      189              
  Lines                14236    14039     -197     
===================================================
- Hits                  8630     8591      -39     
+ Misses                5061     4906     -155     
+ Partials               545      542       -3