Merges stable into master

[gingi]

First merge was done before master to stable.

[codecov]

Codecov Report

Merging #2568 (0937ad4) into master (423e556) will not change coverage.
The diff coverage is n/a.

❗ Current head 0937ad4 differs from pull request most recent head 90352ce. Consider uploading reports for the commit 90352ce to get more accurate results

@@           Coverage Diff           @@
##           master    #2568   +/-   ##
=======================================
  Coverage   65.00%   65.00%           
=======================================
  Files         915      915           
  Lines       26366    26366           
  Branches     5190     5190           
=======================================
  Hits        17138    17138           
  Misses       9228     9228           

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 423e556...90352ce. Read the comment docs.