Merge test-branch into release/500.0

[spencertransier]

Merging test-branch into release/500.0.

Via intermediate branch merge/test-branch-into-release-500.0, to help fix conflicts if any:

                             test-branch  ----o-- - - -
                                               \
    merge/test-branch-into-release-500.0        `---.
                                                     \
                           release/500.0  ------------x- - -

[sonarcloud[bot]]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud