Backport 14333eae647464121150ae77d9f2dbe673aa244b to 1.10

[gbaraldi]

Backport of #579

[ViralBShah]

@dkarrasch Do these go on to release-1.10 or backports-release-1.10?

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 92.66%. Comparing base (8c84b8c) to head (a906108).
Report is 1 commits behind head on release-1.10.

Additional details and impacted files

@@               Coverage Diff                @@
##           release-1.10     #580      +/-   ##
================================================
+ Coverage         92.64%   92.66%   +0.01%     
================================================
  Files                12       12              
  Lines              7670     7672       +2     
================================================
+ Hits               7106     7109       +3     
+ Misses              564      563       -1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[dkarrasch]

backports-release-1.10 may have been deleted after merging, so if this is intended for a single commit, making a PR against release-1.10 directly should be fine. The other question is if we have a backports-release-1.10 PR open over at julialang, or we make a bump PR directly to release-1.10.