Cherry-picks for 8.2.6

[heerener]

Updated the Matplotlib section in PlotShape to accommodate changes from Matplotplib 3.5 to 3.6, so that it does not generate an empty plot. contributed to #2386

[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

[azure-pipelines[bot]]

✔️ d45dd7497496dc636d21d488360d20dc8f2932bd -> Azure artifacts URL